cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,049 Commits 61 Branches 14 Tags
bb1f60e76901458a21279bc327c823cf6d92bb39
Commit Graph

1943 Commits

Author SHA1 Message Date
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00
phil235
43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235
639ff5d161 Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP. 2016-04-24 20:39:30 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
 2016-04-24 20:26:24 +02:00
KorPhaeron
18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
Nerd Lord
fb87a435d1 Aliens and monkeys can now climb structures 2016-04-21 08:59:47 -04:00
KorPhaeron
3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
Nerd Lord
9bd1d57061 You can actually place items in crates now 2016-04-18 19:21:02 -04:00
Cheridan
abb48c84eb Merge pull request #16920 from PKPenguin321/patch-5 
[s] FUCKING GHOST FAGS
 2016-04-18 14:27:18 -05:00
Cheridan
c43d69bd0c Merge pull request #16919 from ChangelingRain/voicefromthecrate-r 
You can now climb onto crates
 2016-04-18 14:12:54 -05:00
Cheridan
e7f7704099 Merge pull request #16921 from RandomMarine/theclothening 
Biogenerated cloth stacks.
 2016-04-18 02:27:36 -05:00
PKPenguin321
c6b9b620fb istype(user) 
i hope i did that right
 2016-04-17 15:15:52 -07:00
Joan Lung
d1e90e4dc6 Merge pull request #16915 from coiax/holodeck-chairs 
Wooden holodeck chairs can no longer be picked up
 2016-04-17 11:56:29 -04:00
Jack Edge
336612f663 You can't pick up NODECONSTRUCTed chairs 2016-04-17 14:39:42 +01:00
RandomMarine
76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
PKPenguin321
e5a9920874 fixes ghost fire extinguishers FOR REAL 2016-04-16 10:58:30 -07:00
Nerd Lord
0e43fa3344 la anchored mob meme 2016-04-16 13:26:24 -04:00
Nerd Lord
f073b3508b butterflies don't lie, so you can't stuff them into crates? 
that's dumb, let's fix it
 2016-04-16 13:15:25 -04:00
Nerd Lord
1b28d1ccf7 this is a better check 2016-04-16 13:14:06 -04:00
Nerd Lord
97a5a4cb9f crate climbing 2016-04-16 13:05:15 -04:00
nullbear
1cb85c3024 Fixes monkey cube Dupe Glitch 
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
 2016-04-15 21:36:34 -07:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03: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
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
7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements 
New Engineering Crates, Shuttle Loan fix
 2016-04-07 21:28:29 -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
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03: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
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
KorPhaeron
9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00
Cheridan
866c418f78 Merge pull request #16592 from bgobandit/ocd 
Alt-clicking a fire extinguisher cabinet opens/closes it.
 2016-04-04 17:43:37 -05:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
PKPenguin321
d098b2594f you cant hide from me you little shit 2016-04-03 18:57:32 -07:00
PKPenguin321
dbcb729f2a fixes a godawful message 
jesus christ who wrote this garbage
 2016-04-03 18:56:14 -07:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
bgobandit
6e52bef680 Alt-clicking a fire extinguisher cabinet opens/closes it. 2016-04-03 07:11:53 -04:00
bawhoppen
af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Joan Lung
c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets 
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
 2016-04-03 13:41:45 +10:00
Lzimann
cb867fe314 Adds a new proc so multiple atoms can be watched for movement 2016-04-02 16:33:56 -03:00
Lzimann
b587496058 Fix locker stuffing 2016-04-02 00:02:50 -03:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
Cheridan
97877c0b2f Merge pull request #16487 from Supermichael777/BZZZZT 
Makes Grills ZAP things when shit gets tossed at them.
 2016-03-31 01:42:58 -05:00
Supermichael777
b525ae0273 I cannot into code too deep 2016-03-30 00:14:14 -04:00
Supermichael777
1d3e9b1817 thanks to remie for reminding me to check things 2016-03-30 00:00:11 -04:00