Commit Graph

175 Commits

Author SHA1 Message Date
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
silicons
bc823b544f sigh 2020-07-29 01:17:16 -07:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
6fbe083e13 ok 2020-07-11 07:03:41 -07:00
silicons
cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons
ed847b1a58 compile 2020-07-11 00:42:13 -07:00
silicons
3d80792e79 more 2020-07-11 00:37:56 -07:00
silicons
8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Linzolle
24da94720b cold res 2020-05-08 11:51:24 -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
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Seris02
c0ff018bef fixes magboots 2020-04-16 16:23:55 +08:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghom
6157500f25 FYI, Dropped() already handles it. 2020-04-13 14:16:48 +02:00
Seris02
468c59bf49 oops 2020-04-13 20:12:20 +08:00
Seris02
950038f4a7 merge fixes? 2020-04-13 11:12:16 +08:00
Seris02
f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02
b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie
2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
Seris02
48076c921d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-03-14 11:41:39 +08:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Ghommie
7bed0d5c87 Of runtimes and null. 2020-03-07 01:57:15 +01:00
ancientpower
12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
Seris02
fc64c0a008 yeah woops forgot that 2020-02-26 18:02:07 +08:00
Seris02
59acbe0125 yee 2020-02-22 20:45:16 +08:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Seris02
577cfdc582 yay much better 2020-02-09 17:04:17 +08:00
Seris02
99147003ed wall walking boooooooooooooooots 2020-02-09 13:07:04 +08:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Seris02
dd09fa554f Update code/modules/clothing/shoes/magboots.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-31 11:54:30 +08:00
Seris02
450f33de39 fix 2020-01-31 11:46:10 +08:00
Seris02
88e42b2e15 *crunch crunch stomp stomp* 2020-01-30 18:07:35 +08:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00