cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 06:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,617 Commits 61 Branches 14 Tags
2eaab2c39e554e73f27e5d672126591cbeb0da25
Commit Graph

7384 Commits

Author SHA1 Message Date
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
RandomMarine
af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Cheridan
4f108b6913 Merge pull request #16745 from coiax/muh-ore-box 
Ore box changes
 2016-04-09 15:43:02 -05: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
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
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
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
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
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
Cheridan
2420e43d1d Merge pull request #16671 from bgobandit/copydocs 
Secret documents can now be copied.
 2016-04-07 13:00:57 -05:00
Cheridan
96bf1d1f74 Merge pull request #16686 from ChangelingRain/medwrench 
Adds the Medical Wrench
 2016-04-07 11:41:34 -05:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances 
Conflicts:
	code/game/atoms.dm
 2016-04-06 21:26:46 +01:00
GunHog
afbe7c0dcc Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-06 14:10:07 -05:00
Nerd Lord
b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04:00
bgobandit
35cf1071cd honk 2016-04-05 22:14:05 -04:00
oranges
aed000580c Keep pixely layout when changing sign type 
This stops signs realigning to your turf when you go to change the sign
type.

Also slight sanity check for adjacency after user uses pen
 2016-04-06 14:02:47 +12:00
bgobandit
94fe7ef642 Secret documents can now be copied. 2016-04-05 19:00:21 -04:00
Cheridan
b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone 
Gives the clown a megaphone.
 2016-04-05 15:35:36 -05:00
AnturK
3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183 
Better sleep()s for procs that abuse it
 2016-04-05 21:03:30 +02:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
AnturK
abe689cac9 Merge pull request #16587 from xxalpha/cigbrand 
Cigarette packs will brand their cigarettes.
 2016-04-05 19:59:09 +02:00
Cheridan
90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan
663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
KorPhaeron
a6cd496c95 Merge pull request #16521 from erwgd/StorageEnhance 
Exosuit and utility belt enhancements, holster description change
 2016-04-04 20:57:03 -05:00
KorPhaeron
9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00