coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
27,543 Commits 9 Branches 11 Tags
2edfd114bdfec94de063141b37b69888a0e3355f
Commit Graph

12467 Commits

Author SHA1 Message Date
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Steelpoint 98aef2ee6a ExtraValueRemoved 2015-09-10 14:10:48 +08:00
Steelpoint 6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Aranclanos f587588eb9 Merge pull request #11636 from duncathan/lol 
distro fix + fixes runtimes
 2015-09-09 20:37:51 -03:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
GunHog 1d9b59e28b Fixes missing chem heater board design 
- Fixes #11673 (deleted a tab)
 2015-09-09 12:53:00 -05:00
xxalpha b238ac02e8 Xeno tweaks and bugfixes. 2015-09-09 17:54:59 +01:00
Aranclanos fbbdbe17ed Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button 
Fixes blood mixing not merging symptoms properly
 2015-09-09 12:48:52 -03:00
Cheridan 304d91fa2c Merge pull request #11606 from Firecage/gunnames 
This gives most projectile guns less generic names.
 2015-09-09 10:45:18 -05:00
Firecage 2a90cd109e Stetchkin pistol rename. 2015-09-09 17:36:14 +02:00
Razharas c40dea1ebd Removes src and renames the argument 
Removes src and renames the argument
 2015-09-09 16:36:40 +03:00
duncathan b86464f573 woo more runtimes 2015-09-08 22:59:18 -06:00
Steelpoint 81e2af9c8a MinorAntagArmourBuff 2015-09-09 12:00:46 +08:00
Steelpoint d45890b4df Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-09 11:47:44 +08:00
Cheridan 44033427a9 Merge pull request #11630 from bgobandit/slimepotionfixfuck 
Fixes/tweaks slime potions.
 2015-09-08 20:11:31 -05:00
Cheridan dbcc6aeed8 Merge pull request #11650 from optimumtact/patch-9 
Better error messages for start game verb
 2015-09-08 20:06:14 -05:00
Razharas 524186e4db Merge pull request #11569 from Anonus/blobchemtweaks 
Changes blob chemicals
 2015-09-09 02:44:34 +03:00
Razharas 161156cffc Merge pull request #11585 from bgobandit/legitposters 
Poster changes!
 2015-09-09 02:38:56 +03:00
Razharas 54a58ddbf5 Fixes blood mixing not merging symptoms properly 
Fixes blood mixing not merging symptoms properly
Fix  #11482
 2015-09-09 01:46:04 +03:00
Razharas f1b1f4caa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceTravel 2015-09-08 21:58:19 +03:00
Razharas e2a25060cc Use defines instead of magic 
Use defines instead of magic
 2015-09-08 21:58:05 +03:00
xxalpha a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes 
Conflicts:
	code/__DEFINES/misc.dm
 2015-09-08 16:56:37 +01:00
Steelpoint a48610fbb9 MinorCHange 2015-09-08 23:20:15 +08:00
xxalpha 5adb732a66 Changed asteroid plating singularity pull to do nothing. 
Changed singularity act on asteroid plating to do nothing.:
 2015-09-08 15:59:35 +01:00
AnturK c2a26c81e7 Adds Create Custom Outfit admin verb 
Sechud fix
 2015-09-08 14:41:15 +02:00
Steelpoint d6f0c2484a InitalCommit 2015-09-08 19:56:07 +08:00
Xhuis 95ca1cb4d2 Some tweaks to Shadowling 2015-09-07 21:46:35 -04:00
oranges 966ec11958 Adds game and attack logging to rags 
This adds a proc to help print reagent lists nicely
 2015-09-08 12:39:48 +12:00
Orange Borg a9e4429d57 Better error messages for start game verb 2015-09-08 11:30:15 +12:00
Razharas e28ecdfe45 Implements round-randomized space map 
Implements round-randomized space map
Kills the cube
Adds config file for maps, so you can add more with just some non-code
edit
 2015-09-07 21:33:11 +03:00
bgobandit ed26da8366 Coffee and tea mugs now appear empty when empty. 2015-09-07 10:53:05 -04:00
bgobandit c74796b317 Fixes asteroid turfs showing up as "mineral deposit." 2015-09-07 10:12:39 -04:00
Cheridan daa5b5b48e Merge pull request #11599 from Firecage/Spiderwerbs 
Adds do_after to the spider verbs.
 2015-09-07 09:08:25 -05:00
bgobandit dc16dfbcc2 Fixes/tweaks slime potions. 2015-09-07 09:48:31 -04:00
Razharas 9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints 
Bloody footprints!
 2015-09-07 16:07:03 +03:00
Remie Richards f0d0a4bf2d Merge pull request #11528 from Aranclanos/undergoingevacuations 
Undergoing evacuations latejoin message fix
 2015-09-07 13:54:54 +01:00
Remie Richards 8b899636b2 Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis 
Fixes a BUNCH of atmos shit
 2015-09-07 13:49:01 +01:00
Jordie0608 08cfaf0b5f see jobban reasons from char setup 2015-09-07 20:44:08 +10:00
Firecage 42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
Aranclanos 732aa1f5be Merge pull request #11600 from octareenroon91/patch-6 
Correct 'You inject' text
 2015-09-06 20:29:28 -03:00
AnturK 1a9b7ad3c0 Admin equipment & ERT outfits 2015-09-07 01:06:09 +02:00
Razharas 580e889e7d Merge pull request #11590 from joonoro/turbinefix 
Fix turbine
 2015-09-07 00:08:30 +03:00
duncathan 50fc7578f7 fixes TEG 2015-09-06 13:16:00 -06:00
AnturK ff8063c68c Adds outfit datum 2015-09-06 20:06:10 +02:00
bgobandit c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
Firecage 63657bb2e7 Adjusts some gun names like sugggested. 2015-09-06 18:09:42 +02:00
Firecage 1b119f6aef Fixes the russian revolver name, my mistake. 2015-09-06 14:30:43 +02:00
Firecage 56925928eb places /improper in the gun names. 2015-09-06 14:27:54 +02:00
Firecage 9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
kingofkosmos 92870108f9 AI now sparks when taking damage. 
AI now emotes upon death.
 2015-09-06 12:23:44 +03:00