shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,430 Commits 5 Branches 0 Tags
ec59412bca2e1052454876261cb57788e39eb18b
Commit Graph

2949 Commits

Author SHA1 Message Date
deathride58 6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
deathride58 984bf470d5 Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093 
[MIRROR] fixes some grinder recipes
 2018-01-08 04:17:29 +00:00
deathride58 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
deathride58 ba909ce9a2 Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128 
[MIRROR] Removes the safe dial multiplier
 2018-01-08 04:15:12 +00:00
deathride58 d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157 
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
 2018-01-08 04:13:47 +00:00
Dax Dupont d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
Tlaltecuhtli 7aa8bf9b69 fixes some grinder recipes (#34093) 
* commit

help what is this

* ddd

* sdsadsda

* fegdhfd

* ddddddddddddddd
 2018-01-07 20:36:29 -06:00
Ashe Higgs c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
Jordan Brown bc636ddb2c Merge pull request #34128 from ShizCalev/safe-dial 
Removes the safe dial multiplier
 2018-01-07 20:08:11 -06:00
kevinz000 ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157) 
* Fixes dchat broadcast

* Update communications.dm
 2018-01-07 18:51:16 -06:00
Jordan Brown 801eab4c3c Fixes decals being created on bad turfs (#34121) 
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
 2018-01-07 18:51:09 -06:00
deathride58 1944c08a7b Merge pull request #4692 from Citadel-Station-13/upstream-merge-34140 
[MIRROR] Fixes armor penetration not working on objects and therefore mechs
 2018-01-07 20:39:29 +00:00
Leo be1fe799db Fixes armor penetration not working on objects and therefore mechs 2018-01-07 11:03:59 -06:00
modularized_suicide c2851e7837 priority:critical 2018-01-07 02:08:51 -06:00
deathride58 ebf3863195 Merge pull request #4681 from Citadel-Station-13/upstream-merge-34034 
[MIRROR] Makes crayons draw at the location you click
 2018-01-05 22:16:53 +00:00
deathride58 6f720a2010 Merge pull request #4672 from Citadel-Station-13/upstream-merge-34083 
[MIRROR] Removed some superfluous stack code
 2018-01-05 22:16:16 +00:00
deathride58 4f30d77421 Merge pull request #4678 from Citadel-Station-13/upstream-merge-34109 
[MIRROR] Changes Rock Description to be more descriptive
 2018-01-05 22:15:22 +00:00
Jordan Brown 505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons 
Makes crayons draw at the location you click
 2018-01-05 09:28:07 -06:00
Jordan Brown 464a2820e3 Merge pull request #34109 from Niknakflak/Its_not_just_a_boulder_its_a_rock 
Changes Rock Description to be more descriptive
 2018-01-05 08:44:38 -06:00
Cruix 015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
Cruix 406ccb256f Fixed PDAs not calling parent in equipped() (#34081) 2018-01-05 05:59:54 -06:00
deathride58 3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059 
[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake
 2018-01-05 02:44:21 +00:00
deathride58 f6c495885c Merge pull request #4663 from Citadel-Station-13/upstream-merge-34060 
[MIRROR] Fixes brothers not assigning properly.
 2018-01-05 01:57:59 +00:00
deathride58 1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
deathride58 f875444339 Merge pull request #4661 from Citadel-Station-13/upstream-merge-34075 
[MIRROR] Adds more observation messages in deadchat
 2018-01-05 01:56:07 +00:00
Leo 7a2955b96f Merge pull request #34060 from AnturK/brotherfix 
Fixes brothers not assigning properly.
 2018-01-04 15:17:56 -06:00
ShiggyDiggyDo 8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
Dax Dupont bf3468f61c Adds more observation messages in deadchat (#34075) 
* Adds more observation messages

* so bold kobold

* caching
 2018-01-04 15:16:58 -06:00
oranges a227ddf3c1 Merge pull request #34025 from DaxDupont/PDAColor 
PDA Interface color is now a preference.
 2018-01-03 21:12:09 -06:00
Jordan Brown 50d75e53c9 Fixes #34030 (#34041) 2018-01-03 15:10:22 -06:00
deathride58 94eeb5981d Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031 
[MIRROR] Prevents Nar-Sie from being double-summoned
 2018-01-03 18:56:31 +00:00
Jordan Brown 1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons 
Prevents Nar-Sie from being double-summoned
 2018-01-03 12:25:35 -06:00
Jordan Brown a642a1c298 Merge pull request #34040 from AnturK/maraudercheck 
Fixes marauder ghostclick jump
 2018-01-03 11:58:42 -06:00
LetterJay 6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917 
[MIRROR] Always use the area name when selecting a teleport beacon
 2018-01-03 04:56:55 -06:00
LetterJay ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601 
[MIRROR] Fixes cross comms
 2018-01-03 04:56:38 -06:00
LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
LetterJay 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay 706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919 
[MIRROR] turfs changed to /space/basic are instead turned into /space
 2018-01-02 18:13:42 -06:00
LetterJay 4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00
LetterJay 6b1f18d60c Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021 
[MIRROR] Fixes ocky icky in the bank vault
 2018-01-02 15:47:01 -06:00
Emmett Gaines f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
LetterJay dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJay 943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
Dax Dupont 6c606654c3 Removes icky ocky from the vault (#34021) 2018-01-02 13:31:28 -06:00
LetterJay b3eb85cdd2 Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035 
[MIRROR] Puts back the changeturf part of PlaceOnTop()
 2018-01-02 08:02:02 -06:00
LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
oranges 18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf 
Puts back the changeturf part of PlaceOnTop()
 2018-01-02 00:12:32 -06:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay 3ee2569379 Update borer_event.dm 2018-01-01 14:07:17 -06:00