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

85 Commits

Author SHA1 Message Date
Leo 90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
Leo 5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
deathride58 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58 8f593f0d00 living carbon 2018-01-04 01:36:28 -05:00
ShizCalev c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
Robustin d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
Jordan Brown 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302 
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
 2017-12-18 15:27:12 -06:00
coiax e93bb49994 Spinning resin or laying eggs on vents prompts the user if they're sure (#33302) 
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.

This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
 2017-12-17 19:27:45 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
oranges 7c1fe79635 Merge pull request #32943 from ShizCalev/alium-softcrit-sprite 
Fixes aliums showing wrong sprite in softcrit
 2017-11-22 15:37:57 -06:00
deathride58 f1818eb11b Update death.dm 2017-11-17 23:22:02 -05:00
vuonojenmustaturska 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
kevinz000 ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
LetterJay 301dbad665 Update life.dm 2017-10-12 02:58:02 -05:00
duncathan salt c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay d7db5f23cb Update humanoid.dm 2017-09-30 02:13:33 -05:00
LetterJay e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572 
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
 2017-09-30 02:41:38 -04:00
LetterJay 8048ce1842 Update humanoid.dm 2017-09-30 01:37:32 -05:00
YPOQ a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
Jordan Brown e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
XDTM 9b5a2f7490 Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow 2017-09-28 16:02:31 -05:00
ShizCalev 4bab4181f2 Fixes alium leap exploit 2017-09-26 13:54:26 -05:00
CitadelStationBot 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
CitadelStationBot 956efbef27 [MIRROR] Removes corgis as a facehugger target (#2791) 
* Removes corgis as a facehugger target (#30719)

* Removes corgis as a facehugger target
 2017-09-16 04:33:16 -05:00
LetterJay 6b27a81e61 Update powers.dm 2017-09-12 03:10:07 -05:00
kingofkosmos 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
CitadelStationBot 349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot a840e9cf05 Fixes shields not blocking alien hunter pounces (#2249) 2017-08-04 08:43:57 -07:00
CitadelStationBot 1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
kevinz000 bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
kevinz000 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00