cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,561 Commits 61 Branches 14 Tags
a1eb2d459b68d2d533f6ced4d497d62bbc9806cd
Commit Graph

15022 Commits

Author SHA1 Message Date
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
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
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
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
Jack Edge
8c4d4df68d Ore box deconstruction with a crowbar 2016-04-09 20:20:32 +01: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
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
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
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
KorPhaeron
05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate 
You can no longer drop survival capsules on top of dense objects
 2016-04-08 13:36:29 -05:00
Cheridan
108eefb86c Merge pull request #16705 from Shadowlight213/adminghostruntime 
Fixes a runtime with IsAdminGhost
 2016-04-08 12:39:01 -05:00
Nerd Lord
5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
Jack Edge
2250fa6929 Cyborgs can use ore boxes when adjacent 
Also, you can't empty an ore box unless you're next to it.
It's possible that was innately enforced before I did some changes,
with the super call in Topic(), so I checked explicitly.

Oh, also ore boxes now drop their ore when destroyed.
 2016-04-08 15:26:22 +01:00
Jack Edge
64e03b60fc Removed automatic inventory close when ore dumping 
Not really sure why this is here, surely you want to see the now empty
bag if you've got it open?
 2016-04-08 14:52:37 +01:00
Jack Edge
f2700e05a1 Fixed "emptying satchel" messages for ore boxes 
Regardless of what container you were emptying into the ore box,
it would always call it a satchel. This has been fixed.
 2016-04-08 14:19:25 +01:00
Jack Edge
d3d4b43e6a Added plant data disks to Protolathe 
Print out some botany data disks if they ask nicely.
 2016-04-08 10:34:21 +01:00
Jack Edge
452577a9dd Added plant DNA circuit board to imprinter designs 
As above.
 2016-04-08 10:22:46 +01:00
Jack Edge
d8530c53f6 Added Jaws reference to assassin holocarp 2016-04-08 08:44:13 +01:00
Jack Edge
11da00d9b7 Fixed /choose not allowing you to choose 
I misunderstood its purpose. I have fixed it now.
 2016-04-08 08:38:50 +01:00
Jack Edge
6b64b5b71a Removed duplicated see invisible var 2016-04-08 08:20:16 +01:00
Jack Edge
501442cec8 Changed back to recent snare stuff 2016-04-08 08:19:24 +01:00
KorPhaeron
6d519c4e26 Merge pull request #16673 from PKPenguin321/fuck-you-goofball 
Reverts most of goof's grab nerf
 2016-04-08 02:05:21 -05:00
KorPhaeron
3478183cd8 Merge pull request #16624 from TechnoAlchemisto/Better_pickaxes 
Makes pickaxe upgrades less horrible and irrelevant.
 2016-04-08 01:29:34 -05:00
KorPhaeron
9bf9aa056f Merge pull request #16695 from TechnoAlchemisto/the_steaks_have_never_been_fire 
Goliath meat is now unplated, has its own sprite uncooked.
 2016-04-07 23:03:41 -05: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
Nerd Lord
8caca4a78e mining mobs fire less often 2016-04-07 20:46:41 -04:00
Nerd Lord
ae22f792c2 fuck this in particular 2016-04-07 20:30:33 -04: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
46f0dd8734 you can no longer drop survival capsules on top of dense objects, like windows 2016-04-07 19:13:20 -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
Jack Edge
aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp 
Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm
 2016-04-07 22:56:08 +01:00
Remie Richards
c816da8505 Updates cursed hearts to use the client_colour system. 2016-04-07 22:17:38 +01:00
Remie Richards
984afed89f Adds a priority system for client.color effects 2016-04-07 21:55:31 +01:00
Razharas
89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS 
Asteroid fixes
 2016-04-07 23:52:37 +03:00