Commit Graph
30071 Commits
Author SHA1 Message Date
Hatterhat 3b873d4000 thanks ghommie 2020-02-14 16:28:39 -06:00
Hatterhat b2e3243760 there's no way this should have worked 2020-02-13 21:32:27 -06:00
CitadelStationBot 89936a1335 Automatic changelog generation for PR #10994 [ci skip] 2020-02-12 09:51:41 -06:00
GhomandGitHub 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
CitadelStationBot f89d3907e9 Automatic changelog generation for PR #11043 [ci skip] 2020-02-12 08:35:05 -06:00
GhomandGitHub 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
CitadelStationBot 88f063623e Automatic changelog generation for PR #11020 [ci skip] 2020-02-12 05:47:35 -06:00
GhomandGitHub 31c7a0e2be Merge pull request #11020 from Zellular/Animations1
Movement animations for the pupdozer
2020-02-12 12:47:32 +01:00
CitadelStationBot a7e24c33c2 Automatic changelog generation for PR #11018 [ci skip] 2020-02-12 04:14:30 -06:00
GhomandGitHub 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
CitadelStationBot 40ab7b45df Automatic changelog generation for PR #10992 [ci skip] 2020-02-12 03:34:28 -06:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub ce5208a1df Merge pull request #11007 from r4d6/random-fixes
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
CitadelStationBot 9997cb4f75 Automatic changelog generation for PR #11032 [ci skip] 2020-02-12 02:09:39 -06:00
GhomandGitHub 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
CitadelStationBot 199df8bec0 Automatic changelog generation for PR #10861 [ci skip] 2020-02-12 02:06:06 -06:00
GhomandGitHub 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
kevinz000andGitHub ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
Zellular 64ab4353fb Revert "Revert "Pupdozer animations""
This reverts commit a642bf9705.
2020-02-11 08:34:11 -08:00
CitadelStationBot 60756cbc35 Automatic changelog generation for PR #11003 [ci skip] 2020-02-11 09:11:14 -06:00
GhomandGitHub 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
Zellular a642bf9705 Revert "Pupdozer animations"
This reverts commit 8fbcdde9e8.
2020-02-11 04:29:45 -08:00
Zellular 8fbcdde9e8 Pupdozer animations
Adds movement states for the pupdozer dogborg module.
2020-02-11 03:49:56 -08:00
kevinz000andGitHub f247c6d8c6 Update pai_defense.dm 2020-02-11 04:27:22 -07:00
CitadelStationBot d05624dbec Automatic changelog generation for PR #10996 [ci skip] 2020-02-11 02:34:07 -06:00
GhomandGitHub 5726f041a8 Merge pull request #10996 from PersianXerxes/gulagChanges
Separates gulag and public mining, removes sec vendor from gulag
2020-02-11 09:34:04 +01:00
kevinz000andGitHub 58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
Hatterhat 1d071ff127 one off 2020-02-10 21:40:51 -06:00
CitadelStationBot 5e342a6f56 Automatic changelog generation for PR #10961 [ci skip] 2020-02-10 14:29:00 -06:00
LinandGitHub 4797b5edc8 Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
2020-02-10 20:28:57 +00:00
CitadelStationBot 2d9e1d2ea3 Automatic changelog generation for PR #10989 [ci skip] 2020-02-10 14:27:41 -06:00
LinandGitHub f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5
CallMaterialName reagent fix
2020-02-10 20:27:38 +00:00
LinandGitHub 4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566
something about suit_digi.dmi
2020-02-10 20:24:35 +00:00
r4d6 dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
kevinz000andGitHub 520dd57bf9 Update mob_helpers.dm 2020-02-10 04:33:27 -07:00
GhomandGitHub c8a62e7acf Merge pull request #10985 from r4d6/Dwarf
Dwarven Update
2020-02-10 12:23:23 +01:00
CitadelStationBot 24ea1aa393 Automatic changelog generation for PR #11001 [ci skip] 2020-02-10 05:22:43 -06:00
GhomandGitHub 3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
Pandemic Fixes
2020-02-10 12:22:40 +01:00
CitadelStationBot 289ad5d3cb Automatic changelog generation for PR #11000 [ci skip] 2020-02-10 05:20:42 -06:00
GhomandGitHub a0666e7454 Merge pull request #11000 from Seris02/rcdfixyeet
makes RCDs not cost a single sheet of glass and metal
2020-02-10 12:20:40 +01:00
CitadelStationBot 0a04d0ab49 Automatic changelog generation for PR #10596 [ci skip] 2020-02-10 05:16:17 -06:00
kevinz000andGitHub c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
CitadelStationBot 754ee3d990 Automatic changelog generation for PR #10967 [ci skip] 2020-02-10 05:15:32 -06:00
kevinz000andGitHub 79146bce9b Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3
Fixes AI unanchoring not properly removing the no teleport trait.
2020-02-10 04:15:29 -07:00
CitadelStationBot 0cfcf99e45 Automatic changelog generation for PR #10988 [ci skip] 2020-02-10 05:14:37 -06:00
kevinz000andGitHub c9e5fd1c17 Merge pull request #10988 from YakumoChen/master
Reverts 10486 (Observe verb in the Ghost tab)
2020-02-10 04:14:33 -07:00
CitadelStationBot e046694f2b Automatic changelog generation for PR #10971 [ci skip] 2020-02-10 05:14:21 -06:00
kevinz000andGitHub 5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby
Adds more Alien disco
2020-02-10 04:14:18 -07:00