coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,874 Commits 9 Branches 11 Tags
8b2175b5e9736acbadb94deff4ac27ca6870ba02
Commit Graph

4133 Commits

Author SHA1 Message Date
Razharas 6baed3a0e5 Merge pull request #8464 from Szunti/patch-1 
prob() with rand() is the same as a plain prob()
 2015-03-23 00:27:47 +03:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Cheridan e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Miauw ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478. 
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
 2015-03-22 18:55:59 +01:00
Swag McYolosteinen 5bf9366bab Removes spaces causing inconsistent indentation error 2015-03-22 13:01:08 +01:00
Swag McYolosteinen ef156368ca Re-adds forcesay 2015-03-22 12:34:55 +01:00
phil235 98f9916317 Yet more work on slime procs and life subprocs. 2015-03-21 20:44:32 +01:00
Szunti 01c18eadca Replaced prob(rand(A,B)) with prob((A+B)/2). 
They are the same probability.
Rounded to integers where the values were literals.
 2015-03-21 19:12:16 +01:00
Xhuis 7f6871c233 Fixes conflicts and commits 2015-03-21 12:47:25 -04:00
phil235 daa1bdf856 More work on slime procs. 2015-03-21 16:37:37 +01:00
Swag McYolosteinen e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants 
Cyber Implants Addendum
 2015-03-21 13:38:27 +01:00
xxalpha 3888013a43 Changed flag list to flag var. 2015-03-21 12:24:27 +00:00
Swag McYolosteinen afa1b76cde Merge pull request #8190 from xxalpha/cyberimplants 
Cybernetic Implants
 2015-03-21 13:19:26 +01:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive 
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
 2015-03-21 09:54:11 +03:00
Remie Richards 819422bc3e Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay 
MIAUW VON SAYCODE 3: RISE OF THE SPANS
 2015-03-21 05:05:37 +00:00
xxalpha 69d4536844 Code tweaks. Designs are now in 'Medical'. 2015-03-20 22:57:52 +00:00
phil235 48bbf303da Fix conflict in xenobiology.dm 
Simplify simple_animal/attackby()
more work on slimes.
 2015-03-20 22:05:09 +01:00
MrPerson 41cb54b8f4 Remove xylophone skeleton ribcage playing 2015-03-20 12:10:52 -07:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
phil235 182a3da16a More work on slimes. Moving xenobiology items to modules/research/xenobiology 2015-03-20 19:17:03 +01:00
Swag McYolosteinen 9e25fe4019 Merge pull request #8431 from AnturK/lawsupdated 
Adds total law changes counter
 2015-03-20 17:46:44 +01:00
Swag McYolosteinen 57aadcc7fb Merge pull request #8424 from phil235/SiliconWeldProtFix 
Fixes silicons being flashed when welding.
 2015-03-20 17:46:16 +01:00
Swag McYolosteinen d95209a5df Merge pull request #8391 from Incoming5643/Statue_of_limitations 
Fixes invincible unstoppable death statues
 2015-03-20 17:43:22 +01:00
Remie Richards 5b18ed7c2e Merge pull request #8403 from MrPerson/no_bug_here 
Fixes character appearances - no more bald albinos
 2015-03-20 04:36:32 +00:00
Miauw 49a3cea290 Fixes #8168 for real. 2015-03-19 20:53:21 +01:00
Miauw c4892765db Makes the sayspan rewrite not runtime everything to fuck. 
Also fixes #8168
 2015-03-19 20:42:33 +01:00
xxalpha a9b18759f2 Fixed HUD examine features. 2015-03-19 19:41:05 +00:00
AnturK 7cccf20fc0 Adds total law changes counter 2015-03-19 14:57:12 +01:00
Jordie 0a3dea39c8 Merge pull request #8343 from Incoming5643/Follow_me_if_you_want_to_live 
Docile slime AI won't try to break your pull
 2015-03-19 16:46:45 +11:00
Jordie 329765618d Merge pull request #8365 from Incoming5643/What_Do_You_Mean_You_Didn't_Want_To_Be_A_Dog 
Adds a little consent system for sentience potions
 2015-03-19 16:45:26 +11:00
Jordie d4a602802b Merge pull request #8394 from phil235/CritBlindFix 
Fixes lack of blindness when in crit.
 2015-03-19 16:44:46 +11:00
Jordie af6464d8bf Merge pull request #8223 from phil235/MimanaFix 
Mimana fix
 2015-03-19 16:44:29 +11:00
Cheridan f180506a2d finished 2015-03-18 23:59:23 -05:00
Iamgoofball b7adce753a Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks. 2015-03-18 20:33:03 -07:00
phil235 c9312a6ab7 Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them. 2015-03-19 04:04:44 +01:00
Cheridan 7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
xxalpha 31de411a11 Merge remote-tracking branch 'upstream/master' into cyberimplants 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/mob_defines.dm
 2015-03-18 20:11:51 +00:00
Miauw 1b753dd1c5 Adds the comic sans span to the new system. 2015-03-18 21:09:36 +01:00
Miauw 3f64d2def3 Re-adds robot span classes. 2015-03-18 20:38:57 +01:00
Miauw 1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
xxalpha edccabb0c4 Only engineering type hardsuits have the inbuilt jetpack. 2015-03-18 17:48:45 +00:00
MrPerson e9a36f4d53 Fixes character appearances - no more bald albinos 
Fixes #8383

Also removed two defunct comments.
 2015-03-18 02:21:56 -07:00
Incoming 94e683885b The uplifted simple mob will now only lose its neutral faction, keeping them safe from other creatures of the same type 2015-03-17 16:40:38 -04:00
phil235 0a0d946848 Fixes lack of blindness when in crit. 2015-03-17 21:24:16 +01:00
xxalpha 8fa8919e2e Added a comment, removed unnecessary line. 2015-03-17 19:41:58 +00:00
xxalpha 6f5ea7f5e7 Adds embedded jetpacks to hardsuits. 2015-03-17 18:42:29 +00:00
Incoming 612ededfd0 Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs. 
Fixes an unreported bug where statues could bleed out
 2015-03-17 14:26:05 -04:00
Iamgoofball 7600697c13 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-03-16 21:13:56 -07:00
xxalpha 4b596b4b72 Small optimization. 2015-03-16 18:16:12 +00:00
xxalpha 9af4972c40 Movement slowdowns only ignored with a jetpack. 2015-03-16 17:49:05 +00:00