Commit Graph

159 Commits

Author SHA1 Message Date
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
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Detective Google
57fca41e20 aeugh2 2020-06-25 15:22:11 -05: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
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07: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
Timothy Teakettle
2d1d2eeda6 final fixes 2020-06-16 23:47:22 +01:00
Timothy Teakettle
779e15f3b5 map fixes 2020-06-16 17:16:31 +01:00
Timothy Teakettle
d10dfbec5e fix maps but it works 2020-06-16 16:23:53 +01:00
timothyteakettle
b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Detective Google
7cb79695c5 first round of testing fixes 2020-05-11 21:04:46 -05:00
Detective Google
424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Detective Google
8f44cf1305 PR TIME WOOO 2020-05-09 00:59:40 -05:00
Detective Google
9f25759aa8 Citsnow -> final name (Snaxi) , fixes arrivals 2020-05-09 00:53:04 -05:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
Detective Google
bad9e76e50 Fixes pirates, ops, the mining base, and gives pirates and ops drills 2020-05-03 00:28:28 -05:00
TrilbySpaceClone
655497be89 why didnt these save? 2020-04-25 18:17:38 -04:00
TrilbySpaceClone
5637ba3b53 more decal delettion 2020-04-25 18:12:09 -04:00
TrilbySpaceClone
a3379089a6 Decal delete 2020-04-24 11:26:21 -04: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
Kraseo
a8759b048e smashes the tyranny of public mining 2020-03-31 23:32:15 +02:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
EmeraldSundisk
0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundisk
4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00
EmeraldSundisk
01d90f5cc8 shut 2020-03-17 08:37:24 -07:00
EmeraldSundisk
e3cbf88989 Revert "5"
This reverts commit 17877d0d75.
2020-03-17 08:33:32 -07:00
EmeraldSundisk
17877d0d75 5 2020-03-17 08:22:17 -07:00
ZeroMan
96bd80ac54 map merge also exists 2020-03-06 15:52:33 -05:00
ZeroMan
e4c871a8d3 eva is maybe dangerous 2020-03-06 15:52:12 -05:00
ZeroMan
ef42a8c2f7 map merge also exists 2020-03-06 15:14:18 -05:00
ZeroMan
bee1f7cfe5 its time to vibe 2020-03-06 15:13:23 -05:00
Persi
c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
keronshb
60a3b134a3 Should fix the rest of the requested changes
Title
2020-02-09 17:30:22 -05:00
keronshb
9609eb64e0 Fixes some files and pathings for this
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghom
37c4565160 Whops. Two beacons, not one. 2020-02-01 02:06:56 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
r4d6
a360a89f86 Map Changes 2020-01-16 15:10:57 -05:00
Ghommie
911685ff0a Fixes raven's shuttle computer not being of the emergency shuttle type. 2019-12-12 23:28:50 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
BlackMajor
3ab0e8950e Bet 2019-10-28 18:07:13 +13:00