Ghom and GitHub
721b647e3c
Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5
...
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
2020-02-13 09:28:35 +01:00
Winter Flare
f32affdb1c
Made Mugs Colorful
2020-02-13 03:26:35 -05:00
Trilbyspaceclone and GitHub
aa12ec70a3
Update shields.dm
2020-02-13 03:02:26 -05:00
kevinz000 and GitHub
40111faab1
Update geiger_counter.dm
2020-02-13 00:12:25 -07:00
kevinz000 and GitHub
f1e0c62141
Update gravity.dm
2020-02-12 23:59:03 -07:00
kevinz000 and GitHub
c790478a3d
Merge pull request #11012 from keronshb/RatvarDrink
...
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
kevinz000 and GitHub
5b01691834
Merge pull request #11005 from Arturlang/Hypospray_fix
...
Moves the hypospray mode change to CTRL click
2020-02-12 23:57:50 -07:00
kevinz000 and GitHub
4e419eed03
Merge pull request #10987 from Ghommie/Ghommie-cit567
...
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
necromanceranne
165f46b836
goodbye blood bullets
2020-02-13 17:05:36 +11:00
Seris02 and GitHub
4ac7fff7e3
ye
2020-02-13 13:37:47 +08:00
kevinz000 and GitHub
4f9652f2d2
Merge pull request #11029 from Putnam3145/fix-that-dumb
...
Made the fallback if config is incorrect for map voting plurality (default)
2020-02-12 21:01:07 -07:00
kevinz000 and GitHub
73e782a4de
Update teleportation.dm
2020-02-12 20:56:09 -07:00
kevinz000 and GitHub
aad78ffb78
Update teleportation.dm
2020-02-12 17:53:42 -07:00
ShadeAware
195760e572
h
2020-02-12 16:37:00 -05:00
ShadeAware and GitHub
0f603f2aff
Fixes icon state for the refill
...
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
Trilbyspaceclone and GitHub
34d8381b67
Update blood_drunk_miner.dm
2020-02-12 15:21:17 -05:00
Trilbyspaceclone and GitHub
0bd1357e5f
flour
2020-02-12 15:03:15 -05:00
Trilbyspaceclone and GitHub
1ce9232958
Update cereals.dm
2020-02-12 15:00:08 -05:00
Trilbyspaceclone and GitHub
ba8c7b191c
Update stickman.dm
2020-02-12 14:52:24 -05:00
Trilbyspaceclone and GitHub
7cd3a51c4e
Update pistol.dm
2020-02-12 14:48:53 -05:00
Trilbyspaceclone and GitHub
b7c3582d86
Update outfit.dm
2020-02-12 14:29:19 -05:00
Trilbyspaceclone and GitHub
551a2593d4
Update color.dm
2020-02-12 14:28:57 -05:00
49a7657404
Correction
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-12 14:26:29 -05:00
Ghom and GitHub
942f3f28be
Merge pull request #10994 from DeltaFire15/narsierunefix
...
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
2020-02-12 16:51:38 +01:00
Ghom and GitHub
2674fa6efc
Merge pull request #11043 from Seris02/apcthingfix
...
fixes apc icons
2020-02-12 15:35:01 +01:00
Artur
21ce2242ac
Conflict fix
2020-02-12 16:21:29 +02:00
Seris02
eb5835f668
fixes apcs
2020-02-12 21:35:51 +08:00
Artur
2bd8499b94
We shallnt want mass production.
2020-02-12 14:28:35 +02:00
Ghom and GitHub
12b84aa333
Update mob_holder.dm
2020-02-12 12:43:47 +01:00
Ghom and GitHub
8c2801fda6
Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
...
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
2020-02-12 11:14:27 +01:00
Ghom and GitHub
af477aa28b
Merge pull request #10992 from Hatterhat/buckbuff
...
buckshot buff - 60 to 75 on all pellet pointblank
2020-02-12 10:34:25 +01:00
Ghom and GitHub
0917617543
Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2
...
improves getImplant by using locate()
2020-02-12 10:33:08 +01:00
kevinz000
d8d6a8efb8
lazy-be-gone
2020-02-12 02:15:56 -07:00
Ghom and GitHub
ce5208a1df
Merge pull request #11007 from r4d6/random-fixes
...
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
kevinz000
33b3d06d4c
im lazy
2020-02-12 01:44:28 -07:00
Ghommie
e5ab230b26
Monky chokehold deluxe.
2020-02-12 09:32:38 +01:00
Ghommie
e099ed9578
Further mob holder fixes.
2020-02-12 09:24:49 +01:00
kevinz000 and GitHub
ebba56202d
Update MC.dm
2020-02-12 01:16:01 -07:00
Ghommie
62ff589840
Something about a couple runtimes.
2020-02-12 09:10:24 +01:00
Ghom and GitHub
fc3f0d02fc
Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7
...
Fixes cryotubes not transferring reagents for minutes at a time (because at tier 4 it takes 80 * 20 = 1600 deciseconds (!!!) to .. transfer regeants??)
2020-02-12 09:09:36 +01:00
Ghom and GitHub
2ed19e0a5a
Merge pull request #10861 from ancientpower/far-sliding-port
...
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
kevinz000 and GitHub
77163c7909
Update capture_the_flag.dm
2020-02-12 00:44:52 -07:00
kevinz000 and GitHub
46d2dc24e9
Update capture_the_flag.dm
2020-02-12 00:43:04 -07:00
kevinz000 and GitHub
66a01c1fe9
Update capture_the_flag.dm
2020-02-12 00:32:40 -07:00
kevinz000 and GitHub
938091ff67
Update capture_the_flag.dm
2020-02-12 00:31:20 -07:00
kevinz000 and GitHub
41f02fa24d
Update capture_the_flag.dm
2020-02-12 00:26:58 -07:00
kevinz000 and GitHub
ecbb7767c3
Update cryo.dm
2020-02-11 23:07:47 -07:00
Putnam
7795e1609d
why did i do that
2020-02-11 15:32:43 -08:00
ShadeAware
bbedf617f5
Declutters the Locker
2020-02-11 17:33:18 -05:00
ShadeAware
5afbe44be3
Attempt Numero Dos!
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
