shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,478 Commits 5 Branches 0 Tags
87365ee74b86b91d4cc043aed57545ad57713afb
Commit Graph
1621 Commits
Author SHA1 Message Date
deathride58 87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58andGitHub 1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
AnturKandCitadelStationBot 3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
Jordan BrownandCitadelStationBot 66dabf4ff7 Merge pull request #36976 from Iamgoofball/patch-422 
fixes cows moving while tipped
 2018-04-06 00:43:38 -05:00
deathride58andGitHub a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
kevinz000andGitHub 3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00
kevinz000andGitHub f94ff21968 readds handholding 2018-04-04 14:24:57 -07:00
YPOQandCitadelStationBot 1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) 
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
 2018-04-03 22:03:20 -05:00
Jordan BrownandCitadelStationBot 0dc793129d Merge pull request #36902 from KorPhaeron/dronevision 
Fixes drone night vision
 2018-04-02 08:32:23 -05:00
LetterJayandGitHub 66420d8504 Merge pull request #6116 from cebutris/moreminerloot 
adds lavaknight corpses to legion drops
 2018-04-02 05:47:30 -05:00
LetterJayandGitHub 7682dd2a7f Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822 
[MIRROR] Fixes monkey retaliation from beyond the grave
 2018-04-01 19:51:17 -05:00
LetterJayandGitHub a5ec18d566 Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816 
[MIRROR] Fixes mutant bodypart assignments
 2018-04-01 19:50:58 -05:00
LetterJayandGitHub dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
LetterJayandGitHub 57ed2fcb70 Merge pull request #6215 from Citadel-Station-13/iconstate 
icon state fix for TechDemon core
 2018-04-01 17:48:13 -05:00
LetterJayandGitHub c4ac6e63f7 Update combat.dm 2018-04-01 17:39:41 -05:00
LetterJayandGitHub 5c817dfd01 Update humans.dm 2018-04-01 17:39:26 -05:00
Jordan BrownandCitadelStationBot 9b8ca10da2 Merge pull request #36856 from iskyp/resin+egg 
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
 2018-04-01 11:11:38 -05:00
KorPhaeronandCitadelStationBot 01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
LetterJay 70264c238b icon state fix 2018-04-01 06:18:26 -05:00
PoojawaandGitHub 75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
LetterJayandGitHub 17e92ca86b Merge pull request #6152 from Citadel-Station-13/upstream-merge-36734 
[MIRROR] Colossus projectile runtime removal
 2018-04-01 01:03:46 -05:00
Jordan BrownandCitadelStationBot 7c6845b750 Merge pull request #36824 from Robustin/mblood 
Monkeys can now die of bloodloss
 2018-04-01 00:17:25 -05:00
KorPhaeronandCitadelStationBot 7f44453232 Being buckled to an object means space wind wont pull you (#36783) 
* Being buckled to an object means space wind wont pull you

* Puts check in the proper place
 2018-03-31 06:18:29 -05:00
LetterJayandGitHub 9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00
LetterJayandGitHub 694f3a6949 Merge pull request #6149 from Citadel-Station-13/upstream-merge-36636 
[MIRROR] Fixes prosthetic limbs injury messages
 2018-03-31 06:16:48 -05:00
RobustinandCitadelStationBot df9894ff4b Fixes monkey retaliation from beyond the grave 2018-03-31 06:16:18 -05:00
ShizCalevandCitadelStationBot 1c76539a5b Fixes mutant bodypart assignments 2018-03-31 06:15:24 -05:00
CruixandCitadelStationBot 0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
LetterJayandkevinz000 cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJayandkevinz000 002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
vuonojenmustaturskaandCitadelStationBot 6e02f61b37 Merge pull request #36734 from Robustin/colossusfix 
Colossus projectile runtime removal
 2018-03-28 12:17:54 -05:00
vuonojenmustaturskaandCitadelStationBot adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup 
Improves some logging legibility
 2018-03-28 12:17:32 -05:00
vuonojenmustaturskaandCitadelStationBot 888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message 
Fixes prosthetic limbs injury messages
 2018-03-28 12:17:23 -05:00
deathride58andGitHub d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663 
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
 2018-03-27 17:51:35 +00:00
deathride58andGitHub 952fd00ff4 Merge pull request #6122 from Citadel-Station-13/upstream-merge-36712 
[MIRROR] Fixes pacifists being able to attack animals
 2018-03-27 17:48:31 +00:00
Ashe HiggsandCitadelStationBot 0f39d85a80 Fixes slimeperson traits (#36663) 2018-03-26 21:12:07 -05:00
Jordan BrownandCitadelStationBot 08569ff906 Merge pull request #36712 from XDTM/NoPunchingIan 
Fixes pacifists being able to attack animals
 2018-03-26 14:19:23 -05:00
Jordan BrownandCitadelStationBot 98b308279f Merge pull request #36710 from fludd12/Inky-Capped-Lists 
Properly Blacklists Mushroom People
 2018-03-26 14:18:03 -05:00
Cebutris 2fd234256e adds lavaknight corpses to legion drops 2018-03-26 09:29:22 -04:00
PoojawaandGitHub c579d81f4c Vore fixes and a few additions (#6032) 
* Fixes saving memes, Adds absorbing and OOC escape

Also allows for people to reload from a slot if they fuck up and delete a belly

* makes sure travis won't flip the fuck out

* fixes some sound issues

* cleaning up some extra sounds, also dragon vore sound settings

* fixes resisting out of guts

* BRACKETS

* Prey now become blind after being eaten.

Use the audible subtle message to continue roleplaying with them!

* Actually make bulges show up in examine

* Fixes cases where transfering between bellies would blind twice

Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
 2018-03-26 04:46:50 -05:00
CitadelStationBotandPoojawa ec0be681cb [MIRROR] Fixed Ranged Guardian moving when recalled (#6101) 
* Fixed Ranged Guardian moving when recalled (#36643)

* Fixed Ranged Guardian moving when recalled
 2018-03-26 04:28:27 -05:00
CitadelStationBotandPoojawa 4f254f181f [MIRROR] Sintouched antag datums (#6096) 
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
 2018-03-26 04:19:49 -05:00
CitadelStationBotandPoojawa 80d5cc2884 [MIRROR] Nerfs monkey spam (#6084) 
* Merge pull request #36380 from vuonojenmustaturska/sauerbraten

Nerfs monkey spam

* Nerfs monkey spam
 2018-03-22 19:31:57 -05:00
CitadelStationBotandPoojawa 1d94d6cbe3 [MIRROR] mobs will stop pulling things on death (#6059) 
* mobs will stop pulling things on death (#36581)

* mobs will stop pulling things on death
 2018-03-22 06:07:15 -05:00
QustinnusandCitadelStationBot 79911d330a Being happy no longer makes you obese. (#36565) 
* D O U B L E N E G A T I V E

* jesus
 2018-03-21 15:35:33 -05:00
deathride58andGitHub 0a331a26ee Merge pull request #5994 from Poojawa/beepboop 
Adds IPCs refractors preferences
 2018-03-21 19:20:43 +00:00
CitadelStationBotandPoojawa 4ad2b2975a [MIRROR] Fixes some more trauma bugs (#6039) 
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
 2018-03-21 12:50:22 -05:00
Poojawa f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00