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

14285 Commits

Author SHA1 Message Date
PKPenguin321 2ecb556e94 addresses minor feedback, fixes implant 
krav maga implant now works 100%
trailing returns and a useless if() removed
 2016-04-14 22:49:29 -07:00
PKPenguin321 c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
Joan Lung fe2b46dfcc Merge pull request #16775 from Fox-McCloud/fab-efficiency 
Fabricator Efficiency Removal
 2016-04-12 18:47:56 -04:00
KorPhaeron c907776872 Merge pull request #16814 from erwgd/PlankMakeRollingPin 
Add rolling pin datum to wooden plank recipes
 2016-04-12 17:29:26 -05:00
KorPhaeron 4c8ea85b59 Merge pull request #16810 from Shadowlight213/giftsprite 
Fixes gift sprite
 2016-04-12 17:19:49 -05:00
Cheridan 9e85fe81be Merge pull request #16743 from TrustyGun/flask 
Changes Flasks a little
 2016-04-12 00:03:19 -05:00
erwgd dbae4b78e0 2 planks are needed to craft rolling pin 2016-04-11 22:41:03 +01:00
erwgd 249a81dd15 Update sheet_types.dm 
changed planks required from 10 to 1 to make rolling pin
 2016-04-11 22:37:46 +01:00
erwgd b2eea7769f Added rolling pin recipe datum to wooden plank 2016-04-11 21:40:44 +01:00
Shadowlight213 89b0b3c50e Fixes gift sprite 2016-04-11 11:32:32 -07: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 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
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
Fox-McCloud e1ba837197 Fabricator Efficiency Removal 2016-04-09 21:48:42 -04:00
Cheridan 4f108b6913 Merge pull request #16745 from coiax/muh-ore-box 
Ore box changes
 2016-04-09 15:43:02 -05: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 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
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
TrustyGun 022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04: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
KorPhaeron eb78787083 Throwing 2016-04-08 23:18:46 -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
Nerd Lord 7579a19457 Blob cores will "take "slight brute" damage" from explosions. 2016-04-08 14:51:32 -04:00
Nerd Lord 30b8112226 Swarmers can now deconstruct simply by clicking 2016-04-08 14:41:13 -04:00
Jack Edge 07aafedcac Added making ore boxes out of 20 wood planks 
Did you know ore boxes were made of wood? It's in the description
for them and everything.
 2016-04-08 15:45:03 +01:00
TrustyGun 927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
Jack Edge d362a2f5e5 Added plant gene disks to secure botany lockers 
The Botany plant DNA machine isn't useful without the diskettes. So here
they are.
 2016-04-08 10:22:46 +01:00
KorPhaeron f1b9082804 Fixes Ripleys 2016-04-08 02:37:23 -05:00
Remie Richards 9d80fb06a7 fixes a potential minor issue with swapping the blueprint's user 2016-04-08 06:42:29 +01:00
KorPhaeron 7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements 
New Engineering Crates, Shuttle Loan fix
 2016-04-07 21:28:29 -05:00
Remie Richards 95d2f9a848 Ports the functionality of the /vg/ holomap to the Station Blueprints, you can now see a layout of cables/pipes/atmos/power machinery as it was at roundstart to assist in repairs 2016-04-08 01:02:41 +01:00
Nerd Lord 13bb58dbc0 orange prisoner ids now show up in wallets 2016-04-07 19:27:17 -04:00
GunHog 6725a2e682 Membrane change, dropper nerf 
- Droppers now only work on human mobs
- Resin membranes now block lasers.
 2016-04-07 18:04:12 -05:00
PKPenguin321 d1d9111fe0 fixes copypasted varnames 
i am a scum coder who dual mains ctrl+c and ctrl+v
 2016-04-07 15:21:42 -07:00
PKPenguin321 00315cff35 fixes magic extinguisher cabinets 
spirits begone
 2016-04-07 15:19:26 -07:00
KorPhaeron 35399d6d0c Merge pull request #16690 from lzimann/revert-16570-patch-182 
Revert "Smooth movement"
 2016-04-07 16:41:47 -05:00
Razharas a8890b264a Merge pull request #16563 from lzimann/lockerfix 
Fix a bug with stuffing people into lockers.
 2016-04-08 00:00:22 +03:00
Razharas 89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS 
Asteroid fixes
 2016-04-07 23:52:37 +03:00
Joan Lung ab129c57c6 Merge pull request #16689 from KorPhaeron/survival_pod 
New Survival Pods
 2016-04-07 16:03:03 -04:00
KorPhaeron b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
AnturK 830f337c66 Merge pull request #16607 from KorPhaeron/mecha3 
Mecha Changes
 2016-04-07 20:10:01 +02:00