Commit Graph

19419 Commits

Author SHA1 Message Date
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
Ghom
a7d29ae830 Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
2020-02-13 09:42:22 +01:00
Ghom
5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
Ghom
b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
2020-02-13 09:40:22 +01:00
Ghom
500ed0dd57 Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
2020-02-13 09:39:26 +01:00
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
Ghom
380983bd10 Merge pull request #11026 from Trilbyspaceclone/patch-278
Makes ninja and wizards no longer spawn with suit sensors
2020-02-13 09:36:10 +01:00
Ghom
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
kevinz000
40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00
kevinz000
f1e0c62141 Update gravity.dm 2020-02-12 23:59:03 -07:00
kevinz000
c790478a3d Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
kevinz000
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
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
Seris02
4ac7fff7e3 ye 2020-02-13 13:37:47 +08:00
kevinz000
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
ShadeAware
195760e572 h 2020-02-12 16:37:00 -05:00
ShadeAware
0f603f2aff Fixes icon state for the refill
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
Trilbyspaceclone
b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00
Trilbyspaceclone
551a2593d4 Update color.dm 2020-02-12 14:28:57 -05:00
Trilbyspaceclone
49a7657404 Correction
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-12 14:26:29 -05:00
Ghom
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
2674fa6efc Merge pull request #11043 from Seris02/apcthingfix
fixes apc icons
2020-02-12 15:35:01 +01:00
Seris02
eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
Ghom
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
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
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
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
kevinz000
ebba56202d Update MC.dm 2020-02-12 01:16:01 -07:00
Ghom
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
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
kevinz000
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
Trilbyspaceclone
a4a128f9dd Ok?
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-11 15:55:54 -05:00
Trilbyspaceclone
1b06506209 Update color.dm 2020-02-11 15:54:37 -05:00
Trilbyspaceclone
a8778417e4 Update standard.dm 2020-02-11 15:52:41 -05:00
Trilbyspaceclone
be58994538 Update outfit.dm 2020-02-11 15:43:17 -05:00
kevinz000
9459212692 Update brigdoors.dm 2020-02-11 08:51:24 -07:00
kevinz000
cc0b815a5d Update brigdoors.dm 2020-02-11 08:47:32 -07:00
Ghom
ac64f6574c Merge pull request #11003 from kevinz000/meme_rifles
Fixes energy lens not being in gun contents
2020-02-11 16:11:11 +01:00
kevinz000
3848da5b6b mso 2020-02-11 07:55:00 -07:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
kevinz000
f247c6d8c6 Update pai_defense.dm 2020-02-11 04:27:22 -07:00
Artur
ce2ab532d9 Maintainer suggestion 2020-02-11 11:23:56 +02:00