b6f69c88ea
Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553
...
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
b02e9c6a90
Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731
...
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
1831bc8ea9
Allows mobs to get shocked when they smash things ( #31677 )
...
also fixes an unrelated runtime involving magillitis
2017-10-14 15:19:37 -05:00
2d32e5f782
Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693
...
[MIRROR] FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-14 15:38:10 -04:00
45619b0e1b
Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
...
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
dce56e3951
Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598
...
[MIRROR] Smoke Machine Updates & Fixes
2017-10-14 10:21:09 -04:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
5fdaba2b0e
Merge pull request #31693 from Armhulen/patch-12
...
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-13 23:49:54 -05:00
4100473aba
Smoke Machine Updates & Fixes ( #31598 )
...
* Smoke Machine Update
* Update smoke_machine.dm
* Compiling again
2017-10-13 16:50:32 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
ca4907b881
Merge pull request #31582 from feemjmeem/smoke-log-announcing
...
Notify admins when someone activates a smoke machine
2017-10-12 16:03:50 -05:00
56f7bcddcc
Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443
...
[MIRROR] Fixes pandemic no beaker UI runtime
2017-10-10 22:33:33 -04:00
3d0f0dd7f0
Fixes pandemic no beaker UI runtime ( #31443 )
2017-10-10 13:51:37 -05:00
a570ec8610
Adds the Chemistry Smoke Machine ( #30920 )
...
* Smoke Machine
* Tweak
* More responsive smoke timing
* Antur Review and Admin Logs
* Cboss review
* More logging
* Removes analyze, streamlines logs
* r-e-a
* no s in reagents_list
* Cyberboss Review
* woops
* Cboss nitpicking
2017-10-10 13:13:38 -05:00
a6ac800db0
Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser ( #31399 )
...
* precision
* precision
* sanity checks
* itt kevinz doesn't know how cyberboss procs work
* fixes
* allows user cancellation
* im dumb
* itt: im still dumb
* fixes stuff, makes it set on init
* refactors reagentgrinder code
* more fixes, prevents melee attacks from going anyways
* ...? wtf is with usetopic
* Finally found out what's wrongw ith this thing.
* fixes a mistake
2017-10-10 03:11:50 -05:00
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
915e79e59b
Merge pull request #3135 from Citadel-Station-13/upstream-merge-31281
...
[MIRROR] Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-05 08:31:23 -04:00
3d364f08f2
Update holder.dm
2017-10-05 07:11:14 -05:00
8e1a31c8af
Update holder.dm
2017-10-05 06:51:59 -05:00
08f3503a81
Update holder.dm
2017-10-05 05:14:27 -05:00
42c59b67b5
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-04 17:55:39 -05:00
441514937e
Moves laughter to the emote
2017-10-04 12:20:23 -05:00
baf72b8412
Merge pull request #31064 from YPOQ/silverfriedfoods
...
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
eb36f34267
[MIRROR] Specifies one format of variable declaration for the codebase. ( #2895 )
...
* Specifies one format of variable declaration for the codebase.
* dumb mirroring
2017-09-22 23:35:36 -05:00
8ef3861b0b
[MIRROR] New squeaky datum and plushes ( #2847 )
...
* New squeaky datum and plushes
* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
8c6c57ff32
Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
...
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
f5f9ada39c
Makes magillitis affect all Hominidae. ( #30841 )
2017-09-20 09:06:02 -05:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
53421365f1
[MIRROR] Adds some new drink functions, buffs Brave Bull ( #2838 )
...
* Adds some new drink functions, buffs Brave Bull (#30521 )
* Adds some new drink functions, buffs Brave Bull
* Light holder object
* Cleans Tequila Sunrise if its light object is eaten
* QDEL_NULL
* Health clamp
* Adds some new drink functions, buffs Brave Bull
2017-09-17 22:19:35 -05:00
b8667591f4
[MIRROR] Minor touchups to chemistry/bar/virology machinery #2484
2017-09-13 17:59:07 -05:00
3ceb70f84d
Fix crit-only healing to include softcrit ( #30520 )
...
With softcrit implemented, people are only unconcious in hard crit. This will no longer bring you out of crit as intended. This PR fixes that.
2017-09-09 16:29:36 -05:00
00199af27d
Merge branch 'master' into upstream-merge-29866
2017-09-06 09:21:53 -05:00
cf93e511ce
Merge pull request #2527
2017-08-29 22:40:02 -07:00
408acdd66d
sync
2017-08-29 22:05:16 -07:00
ec2993289e
sync
2017-08-29 20:07:36 -07:00
5f5065eb46
kek
2017-08-29 09:59:57 -07:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
b151209160
Gives plasmamen hallucinations when taking blackpowder
2017-08-26 11:07:33 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
LetterJay