shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,989 Commits 5 Branches 0 Tags
7b6eee42ce35ae47eec54c9950cc2bc6ce66034e
Commit Graph
1886 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
MoreRobustThanYouandCitadelStationBot 35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
LetterJayandGitHub 85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJayandGitHub 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
XDTMandCitadelStationBot 3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
ShizCalevandCitadelStationBot cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
LeoandCitadelStationBot a7c7e9e8ec Merge pull request #34783 from Cyberboss/FixDumbness 
Cleans up duplicated code and GC issues
 2018-01-24 11:58:37 -06:00
Shadowlight213andCitadelStationBot 4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
LetterJayandGitHub 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
LeoandCitadelStationBot 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
orangesandCitadelStationBot 1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes 
Fixes bot drop & bot assembly issues
 2018-01-23 01:44:09 -06:00
LeoandCitadelStationBot 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
deathride58andGitHub 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
LetterJayandGitHub 8fcef30c56 Update jellypeople.dm 2018-01-22 07:36:43 -06:00
deathride58andGitHub 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
LetterJayandGitHub b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 
[MIRROR] Datum var cleanup
 2018-01-21 23:14:18 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 84b9c4bb2b Update life.dm 2018-01-21 23:09:22 -06:00
Jordan BrownandCitadelStationBot 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
MMMiraclesandCitadelStationBot 372d6505ed make pretty light go light light (#34720) 2018-01-21 21:08:40 -06:00
deathride58andGitHub 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
deathride58andGitHub 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJayandGitHub c408f37b4c Update life.dm 2018-01-21 14:21:23 -06:00
LetterJayandGitHub 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJayandGitHub e02d7ae786 Update life.dm 2018-01-21 14:14:19 -06:00
Tad HardestyandCitadelStationBot 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
ShizCalevandCitadelStationBot 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub e3df465eba Merge branch 'master' into upstream-merge-34667 2018-01-21 11:48:51 -06:00
LetterJayandGitHub 886459dcc3 Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591 
[MIRROR] Fixes slimes attacking people with the slime faction
 2018-01-21 11:48:07 -06:00
LetterJayandGitHub 23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133 
[MIRROR] Temperature Refactor and Fixes
 2018-01-21 11:47:08 -06:00
RobustinandCitadelStationBot e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Dax DupontandCitadelStationBot 4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497) 
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
 2018-01-21 02:04:47 -06:00
Jordan BrownandCitadelStationBot b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix 
Actually fixes wag emote runtime
 2018-01-20 14:09:58 -06:00
Jordan BrownandCitadelStationBot bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery 
Fixes missing MakeSlippery() args
 2018-01-20 14:09:49 -06:00
LetterJayandGitHub 097f2b2ddf Update life.dm 2018-01-20 13:18:25 -06:00
LetterJay a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
XDTMandCitadelStationBot b13be9240c Fixes slimes not attacking anybody 2018-01-19 19:29:52 -06:00
deathride58andGitHub 2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574 
[MIRROR] Added observer verb View Gases
 2018-01-19 19:42:18 +00:00
deathride58andGitHub ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598 
[MIRROR] Illusions now properly use the health argument of Copy_Parent
 2018-01-19 19:39:26 +00:00
deathride58andGitHub ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452 
[MIRROR] Reduce the volume of the death sound on clock work mobs
 2018-01-19 19:36:18 +00:00
deathride58andGitHub e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236 
[MIRROR] Antag Panel / Check antagonists Refactor
 2018-01-19 19:33:25 +00:00
deathride58andGitHub 4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
Jordan BrownandCitadelStationBot 7b9fda5411 Merge pull request #34591 from XDTM/goodBoy 
Fixes slimes attacking people with the slime faction
 2018-01-19 09:24:45 -06:00
Buggy123andCitadelStationBot 57c829a2aa Added observer verb View Gases (#34574) 
* Added observer verb View Gases

* Fixed atmospheric report plurality correctness

* Changed mole/s to mol.
 2018-01-19 09:23:22 -06:00