Commit Graph

19184 Commits

Author SHA1 Message Date
The0bserver
82ffb64268 maybe? 2020-09-01 02:53:29 -04:00
The0bserver
a89d6cd125 I hate circuits. They hate change. 2020-09-01 02:47:05 -04:00
The0bserver
e36f93baeb Sorry, Circuits. (Only slightly.) 2020-09-01 02:42:43 -04:00
The0bserver
89b837461e This should squash the error. 2020-09-01 02:32:28 -04:00
The0bserver
75854915ee You open the door. There's a green bean. 2020-09-01 02:27:15 -04:00
The0bserver
2c6cfd2115 YOU CAN'T STOP ME FROM DREAMING! 2020-09-01 02:19:37 -04:00
silicons
aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
The0bserver
d504d45839 Cat Roomba... (Further solidification of instab) 2020-09-01 01:27:22 -04:00
silicons
10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
silicons
9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
2020-08-31 21:21:09 -07:00
silicons
0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test
Adds a character saving unit test
2020-08-31 21:20:48 -07:00
silicons
77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
lolman360
1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360
4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360
400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
Hatterhat
b1b92c3225 runtiment 2020-08-31 14:12:10 -05:00
Putnam
c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
The0bserver
df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE 2020-08-31 05:01:51 -04:00
The0bserver
b13db43985 Let's not forget this. 2020-08-31 03:27:56 -04:00
The0bserver
dbb6ef7d4e I think we got rid of nutrilevel, finally. 2020-08-31 03:26:43 -04:00
Blue Wildrose
cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
The0bserver
4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
Letter N
ceea4f07ea tested? no 2020-08-31 10:43:03 +08:00
Hatterhat
0db189333a >one fucking callback 2020-08-30 21:21:27 -05:00
timothyteakettle
af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
silicons
4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
The0bserver
c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
The0bserver
af97bddf87 It begins. Earthmother preserve me. 2020-08-30 11:38:46 -04:00
Putnam
cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
Hatterhat
3b571e2edf oh jesus fuck its all gone wrong 2020-08-30 01:33:56 -05:00
Trilbyspaceclone
da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam
66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam
3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam
e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu
c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
2020-08-29 21:41:06 -07:00
silicons
d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates
Modifies the Eminence teleport-to abilties a bit
2020-08-29 21:40:22 -07:00
silicons
05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
silicons
bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
2020-08-29 21:35:58 -07:00
Tupinambis
39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
silicons
16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
2020-08-29 21:33:28 -07:00
silicons
5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2
Fix Tea and give them a glass sprite
2020-08-29 21:33:21 -07:00
silicons
413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
silicons
033feebcd0 Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
2020-08-29 21:31:24 -07:00
silicons
50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
2020-08-29 21:24:41 -07:00
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00