shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
31cf679ce91879bc686df5502408f8a0e545f436
Commit Graph

1703 Commits

Author SHA1 Message Date
ExcessiveUseOfCobblestone 31cf679ce9 Turrets now check borgs! (#35045) 
* epic

* epic2

* epic

* 150 hours

* 150^2 hours
 2018-01-30 22:45:10 -06:00
CitadelStationBot f3c585935f [MIRROR] Typo fix in Bubblegum desc and outdated comment (#5198) 
* Merge pull request #35055 from 81Denton/hecking-typo

Typo fix in Bubblegum desc and outdated comment

* Typo fix in Bubblegum desc and outdated comment
 2018-01-30 10:14:23 -06:00
deathride58 1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939 
[MIRROR] Increases Drone Speed
 2018-01-29 02:30:34 +00:00
deathride58 90cd07e798 Merge pull request #5109 from Citadel-Station-13/upstream-merge-34913 
[MIRROR] Fixes not being able to stop tail wagging
 2018-01-29 02:28:31 +00:00
Anonmare 1eae1971e3 Increases Drone Speed (#34939) 
* Increases Drone Speed

* Update _drone.dm

* I'm not changing it again
 2018-01-28 18:27:14 -06:00
LetterJay 044c13f607 Update emote.dm 2018-01-28 15:13:12 -06:00
Leo 13d9ea5a1c Merge pull request #34996 from ShizCalev/held_mob-runtime 
Fixes held_mob release runtime
 2018-01-28 10:22:41 -06:00
LetterJay c86b256eee Merge pull request #5132 from Citadel-Station-13/upstream-merge-34791 
[MIRROR] Mobs start with a random nutrition amount
 2018-01-28 03:58:38 -06:00
LetterJay d83ac344fa Merge pull request #5126 from Citadel-Station-13/upstream-merge-34945 
[MIRROR] Slows Simple Clowns
 2018-01-27 14:17:42 -06:00
LetterJay 396245d85f Update mob.dm 2018-01-27 14:16:47 -06:00
coiax 6d9e8110f5 Mobs start with a random nutrition amount 2018-01-26 19:56:09 -06:00
Jordan Brown b71d6f962d Merge pull request #34945 from epochayur/master 
Slows Simple Clowns
 2018-01-26 12:37:51 -06:00
ShizCalev 1c38838793 Parrot fixes (#34934) 2018-01-26 11:21:09 -06:00
Jordan Brown ca8f80e454 Fixes not being able to stop tail wagging 2018-01-26 03:00:08 -06:00
YPO f51fcc835f Fixes brains being left in hands after being inserted into heads 2018-01-26 02:59:12 -06:00
LetterJay 9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay 50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay 793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
MoreRobustThanYou 35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
LetterJay 9652fc4127 Merge pull request #5064 from Citadel-Station-13/upstream-merge-34783 
[MIRROR] Cleans up duplicated code and GC issues
 2018-01-24 13:59:44 -06:00
LetterJay 8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
LetterJay 85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJay 937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769 
[MIRROR] Cleans up unused mob vars
 2018-01-24 13:56:23 -06:00
XDTM 3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
ShizCalev cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo a7c7e9e8ec Merge pull request #34783 from Cyberboss/FixDumbness 
Cleans up duplicated code and GC issues
 2018-01-24 11:58:37 -06:00
Shadowlight213 4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
LetterJay 9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733 
[MIRROR] Fixes bot drop & bot assembly issues
 2018-01-23 08:23:29 -06:00
Leo 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
oranges 1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes 
Fixes bot drop & bot assembly issues
 2018-01-23 01:44:09 -06:00
Leo 8bdf83cc72 Merge pull request #34727 from ShizCalev/simpleanimal-godmode 
Stops simple_animals from attacking mobs in godmode
 2018-01-22 15:46:28 -06:00
deathride58 5aad92cf11 Merge pull request #4948 from Citadel-Station-13/upstream-merge-34590 
[MIRROR] Fixes slimepeople not being able to open the bodyswap menu
 2018-01-22 20:29:46 +00:00
LetterJay 8fcef30c56 Update jellypeople.dm 2018-01-22 07:36:43 -06:00
deathride58 fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667 
[MIRROR] Fixes slimes not attacking anybody
 2018-01-22 06:25:14 +00:00
LetterJay b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 
[MIRROR] Datum var cleanup
 2018-01-21 23:14:18 -06:00
LetterJay 1beea71328 Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720 
[MIRROR] Syndicate+Pirate mobs now give off light if appropriate
 2018-01-21 23:10:57 -06:00
LetterJay 6b998377ca Merge pull request #4996 from Citadel-Station-13/upstream-merge-34686 
[MIRROR] Ends the great monkey freezing epidemic
 2018-01-21 23:10:00 -06:00
LetterJay 84b9c4bb2b Update life.dm 2018-01-21 23:09:22 -06:00
Jordan Brown e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
MMMiracles 372d6505ed make pretty light go light light (#34720) 2018-01-21 21:08:40 -06:00
deathride58 28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633 
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
 2018-01-21 22:42:53 +00:00
deathride58 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJay c408f37b4c Update life.dm 2018-01-21 14:21:23 -06:00
LetterJay 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJay e02d7ae786 Update life.dm 2018-01-21 14:14:19 -06:00
Tad Hardesty 4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) 
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
 2018-01-21 13:34:04 -06:00
ShizCalev 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJay d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497 
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
 2018-01-21 11:55:52 -06:00
LetterJay 9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654 
[MIRROR] Actually fixes wag emote runtime
 2018-01-21 11:49:13 -06:00
LetterJay 7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656 
[MIRROR] Fixes missing MakeSlippery() args
 2018-01-21 11:48:56 -06:00