coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,578 Commits 9 Branches 11 Tags
b2eea7769f15c3ced5bf6578cec18b2a68e146ef
Commit Graph

25962 Commits

Author SHA1 Message Date
erwgd b2eea7769f Added rolling pin recipe datum to wooden plank 2016-04-11 21:40:44 +01:00
KorPhaeron 36b5122709 Merge pull request #16786 from TechnoAlchemisto/emote_fix 
Fixes a simple animal emote.
 2016-04-11 10:35:18 -05:00
duncathan salt e20b7caffe dumb 2016-04-11 08:37:16 -06:00
duncathan salt aab7fdbde9 fix 2016-04-11 08:35:05 -06:00
KorPhaeron 4ea85ca6e1 Merge pull request #16781 from RandomMarine/golemship 
Golem ship tweaks and additions
 2016-04-11 09:18:53 -05:00
duncathan salt 3966b7b957 removes uneeded warning 2016-04-11 00:14:04 -06:00
Jordie 8c5a12aec5 Merge pull request #16797 from tgstation/509compatibilitywillbemaintaineduntil510isreleasedasastableversionofBYOND 
improves parse_gas_string(); fixes 509 support
 2016-04-11 16:11:21 +10:00
duncathan f35306eda3 it works now 2016-04-10 23:40:20 -06:00
RandomMarine 0c48762aee Removed comment. 2016-04-10 21:31:54 -07:00
duncathan c67285e5a1 improves parse_gas_string(); hopefully fixes 509 support 2016-04-10 19:28:24 -06:00
RandomMarine 9a6b11e785 Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship 
# Conflicts:
#	config/admins.txt
 2016-04-10 17:13:19 -07:00
Cheridan a1eb2d459b Merge pull request #16729 from RemieRichards/holomap_port 
Station blueprints improvements
 2016-04-10 13:40:34 -05:00
Cheridan 0e012e5c55 Merge pull request #16719 from CosmicScientist/QoL_PA 
Changes PA computer sprite and fixes east facing sprites
 2016-04-10 13:11:59 -05:00
Cheridan f650cf0e0d Merge pull request #16720 from RemieRichards/client_colour_handler 
Adds a priority system for client.color effects
 2016-04-10 13:06:22 -05:00
Cheridan 16ee1af937 Merge pull request #16757 from KorPhaeron/throwing 
You can throw people over tables
 2016-04-10 12:38:51 -05:00
Joan Lung 47775c6816 Merge pull request #16763 from coiax/emagging-cargo-for-the-posters 
Emagging cargo console also unlocks contraband
 2016-04-10 11:45:38 -04:00
TechnoAlchemist a30b6a7502 fixes an emote. 2016-04-10 01:00:40 -07:00
Shadowlight213 a6db6f0d1a Adds a cryostorage version of the ghost spawner. (#16466) 
* Adds An infinitely reusable version of the mob spawner.

* uses

* Fixes

* updates a comment.
 2016-04-10 15:42:54 +10:00
RandomMarine af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Cheridan cdf8d7b2a3 Merge pull request #16751 from ChangelingRain/robustinsponsored 
Blob cores "will "take "slight brute" damage" from explosions".
 2016-04-09 21:21:02 -05:00
Cheridan 5b66a9861b Merge pull request #16434 from Incoming5643/space_land 
Puts some space behind space and turns on space ruins
 2016-04-09 20:40:14 -05:00
CosmicScientist 45ac330702 removes computer sprite change, adds mouse_opacity 2016-04-10 01:52:08 +01:00
Cheridan 4f108b6913 Merge pull request #16745 from coiax/muh-ore-box 
Ore box changes
 2016-04-09 15:43:02 -05:00
Jack Edge 71ffa79379 Changed WOOD variable to wo 2016-04-09 20:34:39 +01:00
Cheridan 542b238125 Merge pull request #16741 from KorPhaeron/ripley_fix 
Fixes Ripley Drills
 2016-04-09 14:24:04 -05:00
Cheridan a0a1ea4478 Merge pull request #16750 from ChangelingRain/qualityofswarm 
Swarmers can now deconstruct simply by clicking
 2016-04-09 14:22:58 -05:00
Jack Edge 8c4d4df68d Ore box deconstruction with a crowbar 2016-04-09 20:20:32 +01:00
Jack Edge cf1c43598b You can now only emag the cargo circuit once 2016-04-09 19:26:28 +01:00
Cheridan 0f6b503878 Merge pull request #16728 from ChangelingRain/literallyjustawallet 
Orange prisoner ids now show up in wallets
 2016-04-09 13:21:25 -05:00
Joan Lung 0af8681bb7 Merge pull request #16724 from coiax/my-best-friend-is-a-holocarp 
My best friend is a holocarp
 2016-04-09 14:19:18 -04:00
coiax daecc5983b Revert "HERES YOUR CODE FIX SIR" 2016-04-09 19:10:26 +01:00
Jack Edge bb1e021b95 Added emagging the cargo circuit board 
In addition, a circuit once emagged will be unable to return to
only legitimate channels.
 2016-04-09 18:32:26 +01:00
Nerd Lord 3433fd2bd1 fixes emps not working on swarmers 2016-04-09 12:35:44 -04:00
Nerd Lord 84ae3dd731 ... 2016-04-09 12:33:32 -04:00
Jack Edge 870208e7e4 Made ore boxes cost 4 wood instead of 20 2016-04-09 15:53:38 +01:00
Jack Edge fe07608196 Emagging cargo console also unlocks contraband 
Using an emag will also unlock some of the speciality crates that you would
normally have to multitool the cargo circuit board for.
 2016-04-09 15:45:01 +01:00
AnturK fee254926e Merge pull request #16680 from Core0verload/nomoremagic 
Wizard events will no longer fire unless actually summoned by a wizard
 2016-04-09 15:57:30 +02:00
AnturK 86eee6605d Merge pull request #16478 from GunHog/WJ_Likes_To_Inspect_His_Xenos 
Xenomorph changes and features
 2016-04-09 12:23:20 +02:00
KazeEspada c6eaacac78 Refactors guardian code so that the name datums do everything. Makes it so that guardians can use an overlay system. 2016-04-09 00:29:36 -07:00
KorPhaeron d06a1ea62e New Mining Loot (#16718) 
New Mining Loot
 2016-04-09 05:21:06 +01:00
KorPhaeron eb78787083 Throwing 2016-04-08 23:18:46 -05:00
Cheridan 5b526b1cb6 Merge pull request #16517 from bgobandit/fluffstocks 
Localizes stock text.
 2016-04-08 22:57:46 -05:00
Remie Richards 637f451b9a Merge pull request #16708 from Bawhoppen/pinremovaltweak 
Pin removal recipe change
 2016-04-09 03:35:09 +01:00
bawhoppen 5c513649dd changes welding tool requirement 2016-04-08 21:12:18 -05:00
GunHog d67feceb07 Forgot to close the span 2016-04-08 18:26:58 -05:00
GunHog 8ed74088c1 Dropper change 
- Droppers once again work on all mobs, but now do not work on aliens.
1000% more snowflake yet less anger inducing!
 2016-04-08 18:25:23 -05:00
Cheridan e6e4ee9998 Merge pull request #16725 from PKPenguin321/patch-9 
fixes magic extinguisher cabinets
 2016-04-08 17:53:54 -05:00
KorPhaeron 82786783f4 Merge pull request #16716 from coiax/plant-genes 
Added a "plant DNA manipulator" to Botany backroom
 2016-04-08 16:34:34 -05:00
Jack Edge 0465ea35f8 Fixed inaccurate description of design item 2016-04-08 22:25:05 +01:00
Jack Edge a066e1f3b4 Changed "the" to "/the" 
I don't know why I did this, I was told to.
 2016-04-08 21:49:42 +01:00