e0b2156142
fixes fixes fixes
2020-11-14 19:26:54 +01:00
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
016fd2ac3c
woo yeah yeah woo
2020-08-15 23:55:52 -05:00
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
238af723bb
makes insects specifically insects not flies
2020-07-25 18:14:12 +01:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
060b3dcd04
im sorry moths
2020-07-24 03:27:44 +01:00
8f8aaee36c
fixes up drinks
2020-07-23 22:09:14 +01:00
450509347a
tidy species more
2020-07-23 21:57:32 +01:00
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
0d197e82f8
Merge branch 'master' into cool-ipcs
2020-06-19 01:57:02 +01:00
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
9a08623308
sigh
2020-06-12 18:39:45 -07:00
8e6dee515a
null isn't an object
2020-06-12 17:16:36 -07:00
146542b077
sdql2
2020-06-12 16:33:36 -07:00
38bf529f3c
a tonne of fixes
2020-06-11 20:18:36 +01:00
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
f2aa370506
make ipcs cool
2020-06-04 14:59:52 +01:00
75dec8ce2c
Ports "Removes the absolute istype fest from footsteps" ( #12259 )
...
* Ports "Removes the absolute istype fest from footsteps"
* Update species.dm
2020-05-18 04:46:22 -07:00
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
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
d49210fd48
Merge branch 'master' into race_drinks
2020-04-14 19:21:47 -04:00
a46a6227a9
Finally done...
2020-04-14 19:11:53 -04:00
79a72a50d4
this is annoying, why is angel not defind as a race
2020-04-14 11:13:49 -04:00
bf837d97d7
Merge remote-tracking branch 'Arturlang/Garlic' into Garlic
2020-02-28 14:12:12 +02:00
5d3f3fc06a
WIP
2020-02-28 14:11:38 +02:00
74d6473c3b
Initial Commit
...
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
2020-02-25 17:07:40 +02:00
187b9bb13a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483
2019-12-23 05:10:38 +01:00
fb2b259d92
Ports "Refactors can_see_reagents"
2019-12-19 17:17:18 +01:00
f9b632019b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-18 21:39:45 -06:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
318c03cc28
Merge pull request #9683 from Ghommie/Ghommie-cit303
...
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
df051186eb
Merge branch 'master' into abductor-update
2019-11-11 00:08:59 +00:00
4ab3512dda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-04 23:15:12 +01:00
401f21d746
Fixing broken fixes. Testing.
2019-11-03 01:19:45 +01:00
b653595702
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-10-31 22:40:11 +01:00
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
DeltaFire