shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

170 Commits

Author SHA1 Message Date
Blue Wildrose
5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Linzolle
0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Detective Google
eed7e4ad02 also painting frames 2020-08-17 00:39:25 -05:00
Detective Google
ee7c528185 adds art to ghost cafe 2020-08-17 00:36:09 -05:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
silicons
1bc2404bae revert cc 2020-07-29 01:47:14 -07:00
Keate Senior
5284fbbec0 various fixes to make the PR not conflict with clickdelays probably 2020-07-28 23:52:13 -04:00
Keate Senior
e2eb08fcba probably gets travis to stop yelling about the new reebe 2020-07-25 17:43:49 -04:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
3c4b11f3f2 please 2020-07-21 11:20:45 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Keate Senior
214db57e95 minor Reebe edits 
Basically just makes sure all the component decorations in Reebe can't be used for a varying amount of starter power
 2020-07-19 02:09:43 -04:00
Keate Senior
3521a54c2b Reebe as its own z is just easier to manage, so its back to being one 
Sorry maxcappers and BoH bombers, your cheap tactics will no longer work if you manage to sneak into the void
 2020-07-15 00:44:30 -04:00
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing 
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
 2020-07-12 00:43:54 -04:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
kevinz000
b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck 
holodeck WRESTLING
 2020-03-31 18:03:00 -07:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) 
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
 2020-03-31 22:04:55 +02:00
Timothy Teakettle
2caeaba8dc moves two tables 2020-03-29 14:17:00 +01:00
timothyteakettle
b89a6b0398 makes everything work 2020-03-29 02:44:44 +01:00
timothyteakettle
5afe5aab3f fixes the map, adds subtype of martial art 2020-03-29 00:46:18 +00:00
Timothy Teakettle
818d7b2ebf initial wrestling arena 2020-03-28 23:13:24 +00:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000
fa2cc0cfdf adds 2020-01-27 03:39:27 -07:00
Winter Flare
3828c60367 Update CentCom.dmm 
Towel Bins into Bedsheet Bins
 2020-01-20 02:07:33 -05:00
Winter Flare
710eaa7fc0 Lighting + Carpet Locker fixes. 2020-01-20 01:06:02 -05:00
Winter Flare
c8b5c6e3cd Ghost Cafe Beautification 
Added Vendors
Added Carpeting and Wood
Made Botany, Dorms, and Kitchen/Bar slightly larger.
Added Vendor Refills
Added a ton of Janitorial Stuff
Added a second set of showers.
Added more trashcans.
Added Ambrosia Gaia seeds.
Added Bedsheet + Towel Bins
Added one Slot Machine
Scattered around some Coins
 2020-01-20 00:22:24 -05:00
Putnam
133cb89b32 hilbert's hotel for ghost dojo 2020-01-18 06:55:26 -08:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
Putnam
9750eb3d42 "quotation marks" 2020-01-06 23:52:07 -08:00
Putnam
b5026256db aaand a few more 2020-01-06 23:42:27 -08:00
Putnam
6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
Putnam
4b6e8cfa18 no, not a cryo... 2019-12-30 01:26:03 -08:00
Putnam
8d00e4f094 added crematorium, replaced every floor in the ghost cafe with indestructible ones 2019-12-30 01:17:48 -08:00
Putnam
a4c356ad57 added a cryo to the ghost cafe 2019-12-29 21:28:09 -08:00
Trilbyspaceclone
f8c039f9eb Update CentCom.dmm 2019-12-27 21:39:01 -05:00
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Useroth
cbff758d1a Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility. 2019-12-26 07:49:48 +01:00
Iroquois Pliskin
9a9c63bea3 Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case. 2019-11-26 09:28:40 -05:00
Persi
1e911cd5b2 Patches an exploit that allows the crew to shoot the Ark from the Reebe dressing room. 2019-10-30 21:16:49 -04:00