coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,835 Commits 9 Branches 11 Tags
a7c2b14d836e572957ea0311ce8a009a69a44cd5
Commit Graph

6867 Commits

Author SHA1 Message Date
Cheridan a7c2b14d83 Merge pull request #6159 from optimumtact/halfthecake 
Removed nearly all move penalties while in space
 2014-12-09 08:46:54 -06:00
Razharas cc8c221fab Merge pull request #6257 from as334/Slimes 
Add's more stuff for Xenobiology and slimes
 2014-12-09 06:44:12 +03:00
Razharas d61ecfa324 Merge pull request #6181 from GunHog/Autosay_Fix 
Lets AI and Borgs control radio behavior for auto announcements.
 2014-12-09 01:16:48 +03:00
GunHog b9531ad5e7 [r] -> [radiomod] 
Just changes instances of [r] to [radiomod]. No functional changes.
 2014-12-08 15:40:45 -06:00
Swag McYolosteinen b828448645 Merge pull request #6228 from paprka/coatscoats 
Adds winter coats and changes labcoat toggling
 2014-12-08 11:35:56 +01:00
Swag McYolosteinen bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00
paprka c158599253 Christmas santa hats! 2014-12-07 20:02:03 -08:00
as334 766780ca98 Testing if git has unfucked. 2014-12-07 22:17:41 -05:00
as334 f3e2c2d1f9 Add's feedback, changes plasma usage. 2014-12-07 21:35:52 -05:00
Razharas 5a78aa83be Merge pull request #6225 from NecroticBinder/Clean_Slime_Fix 
Clean slime fix
 2014-12-08 04:31:58 +03:00
as334 7b05f3962b Fixes chem reactions 2014-12-07 16:42:37 -05:00
as334 f21e9d0a6b Adds neat slime stuff 2014-12-07 16:20:31 -05:00
Swag McYolosteinen 609807df75 Merge pull request #6199 from Ergovisavi/less_terrible_human_plants 
Pod Cloning changes
 2014-12-07 17:34:54 +01:00
Ergovisavi e581a3ff8f Commiting changelog for new replica pod behavior 2014-12-07 05:13:54 -08:00
Remie Richards b4c5b7348d Merge pull request #6222 from phil235/SaltShakerFix 
Fixes saltshaker icon when adding salt to a condiment bottle.
 2014-12-06 23:57:29 +00:00
Swag McYolosteinen 6f5b2cf7ea Merge pull request #6224 from fleure/gargleblaster 
Changes Gargle Blaster description
 2014-12-06 10:28:23 +01:00
paprka 953bffd23b compile error fix 2014-12-05 21:27:52 -08:00
paprka 0f3f0659d1 coats to lockers, winter boots 2014-12-05 21:14:49 -08:00
Razharas 6fb548b283 Merge pull request #6220 from MrPerson/yet_another_attempt_at_fixing_this_shit 
Fixes mobs getting moved on the escape pods when buckled
 2014-12-06 07:42:12 +03:00
Cheridan d124415c85 Merge pull request #6212 from GunHog/DS_Ninja_Biosuit_Anti-acid 
Acid immunity for Biosuits, Ninja, and DeathSquad, and fire protection for DeathSquad
 2014-12-05 14:45:53 -06:00
Razharas 7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas 6ce052f45a Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix 2014-12-05 20:45:27 +03:00
paprka 9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
NecroticBinder aff046443a Update say.dm 2014-12-04 15:30:20 -06:00
Cheridan f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
fleure 571e3a4487 Changes Gargle Blaster description 2014-12-04 18:03:50 +00:00
phil235 e3c7018048 Fixes saltshaker icon when adding salt to a condiment bottle. 2014-12-04 17:04:28 +01:00
Cheridan 90fc7f3740 Merge pull request #6026 from phil235/BluespaceCrystalVanishFix 
Adding sparks, sound and messages when a bluespace crystal is crushed or thrown
 2014-12-04 09:32:02 -06:00
MrPerson 47c46844f2 Another buckling fix 
Fixes #5730

The ride never ends
 2014-12-04 05:42:21 -08:00
GunHog 958e824f37 Acid protection for Biosuits, Ninja, and DeathSquad 
- Biosuits, Ninja armor, and Deathsquad armor are now immune to acid.
- Deathsquad armor is now also fireproof!
 2014-12-03 22:58:21 -06:00
Menshin 738bfe27a4 Not idea why if(_dmm_preloader) fails to catch nulls... 2014-12-03 20:03:47 +01:00
hornygranny bc9d9f6d58 Merge pull request #6105 from RemieRichards/AcidProtectionUpdate 
Acid protection update
 2014-12-03 10:28:47 -08:00
hornygranny 23fd694320 Merge pull request #6127 from phil235/SpanFix1 
Fixes span classes and show_message()'s
 2014-12-03 10:28:06 -08:00
hornygranny 81061d3f62 Merge pull request #6182 from phil235/AdjustMaskFix 
Fixes adjustmask verb for sechailer
 2014-12-03 10:27:25 -08:00
phil235 dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-12-03 18:59:32 +01:00
Swag McYolosteinen 879f67d834 Merge pull request #6142 from CorruptComputer/dropinacancel 
Adds a cancel button to the drop bomb verb
 2014-12-03 18:12:45 +01:00
GunHog ee94f32aa3 Merge remote-tracking branch 'remotes/upstream/master' into Autosay_Fix 
Conflicts:
	code/modules/mob/living/silicon/silicon.dm
 2014-12-03 11:11:02 -06:00
Swag McYolosteinen 5863d2f5e8 Merge pull request #6075 from Jordie0608/spaceisalivewiththesoundofmidis 
Stop Sounds usable by any holder
 2014-12-03 17:49:51 +01:00
Swag McYolosteinen 501ecb1d2a Merge pull request #5945 from JJRcop/get_ghost-fix 
Fixes unreported issue with get_ghost
 2014-12-03 17:45:07 +01:00
Remie Richards 16506dabc9 Merge pull request #6162 from tkdrg/simplepush 
mob/Bump() refactor
 2014-12-03 16:43:58 +00:00
Swag McYolosteinen 9618c11a60 Merge pull request #5480 from Perakp/wormholeProjector 
Bluespace wormhole projector
 2014-12-03 17:42:49 +01:00
Remie Richards af54024222 Merge pull request #6120 from Menshin/maploader_multiple_tiles_underlaying 
[MAPLOADER] Add support for the DMM multiple tiles on one turf underlaying
 2014-12-03 16:42:21 +00:00
Remie Richards 8eced8d302 Merge pull request #6134 from Menshin/null_loc_mobs_fix 
Prevent some mobs from spawning in nullspace
 2014-12-03 16:39:30 +00:00
Ergovisavi ff5b845371 Some changes to Blood and Replica Pods, adds more vars for allowing Replica pods to clone without an intact body, sets replica production to 1 for faster cloning, makes you a plantman/woman 100% of the time 2014-12-03 06:29:49 -08:00
Cheridan 4a4b1c1266 Merge pull request #6169 from phil235/DeathNettleBlendFix 
Two fixes for grinder
 2014-12-02 22:34:52 -06:00
hornygranny 3388c53838 Merge pull request #6110 from tkdrg/aiaiai 
Fixes exploit that lets AIs use machinery even after cameras are disabled
 2014-12-02 18:40:28 -08:00
Orange Borg 78216b8217 Temp + weight + suit weight no longer slows out of gravity 
Space is still slightly slower without a jetpack.
 2014-12-03 13:44:38 +13:00
phil235 515807ee67 Fixes adjustmask verb for sechailer letting you chose the user mob from a list of all mobs on screen. 2014-12-02 19:25:31 +01:00
GunHog 6ac3d8f2e8 Lets AI and Borgs control auto announcements 
The AI and cyborgs can now control if they speak on the radio and the
channel used when stating laws or  (AI only) announcing new player
arrivals.
 2014-12-02 11:43:36 -06:00
Razharas f4f3768d70 Fixes ex_act() destroying too much shit 
Borg modules are safe
So are items with bomb protection
Items in people who wear bomb-protective gear are safe too
 2014-12-02 18:30:56 +03:00