cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,710 Commits 61 Branches 14 Tags
7041877ebdfd6600a563b176374a2ad925edee52
Commit Graph

777 Commits

Author SHA1 Message Date
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
phil235
94a5d5bfad Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. (#18244) 2016-06-05 12:48:19 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00
PKPenguin321
01281044a1 refines autoimplanter code, replaces CMO eye HUD augment in locker with single use eye HUD augment autoimplanter 2016-06-02 23:23:52 -07:00
PKPenguin321
cf71a5833f repaths plant analyzers 
so they are no longer children of regular analyzers
 2016-06-01 22:44:03 -07:00
Jack Edge
37acbe9990 Adds "blood freezer", adds to map 
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
 2016-05-31 00:49:42 +01:00
GunHog
70380bc0d5 Head Megaphones 
Adds megaphones to CE, CMO, and RD lockers.
 2016-05-26 14:24:17 -05:00
oranges
947e2c5c19 Fix an antipattern when using canUseTopic 
remove redundant range checks that are checked in the fixed canUseTopic
 2016-05-22 00:23:47 +00:00
Cheridan
328a69ebf2 Merge pull request #17396 from KorPhaeron/security 
Gives the HoS a pinpointer
 2016-05-20 06:35:30 -05:00
Annie Acosta
ec90f1d23f gives security their normal headsets back (#17467) 2016-05-13 12:47:15 -05:00
Crushtoe
69508ecc90 Fixes grammar issue 2016-05-12 08:19:04 -05:00
Jack Edge
631d854187 Only one pie in a closet 2016-05-10 11:46:50 +01:00
Jack Edge
40c90f6800 Added cream pie closet, for clowns, by clowns 2016-05-08 22:10:56 +01:00
Joan Lung
5188387792 Merge pull request #17420 from coiax/robustin-pantry 
New SW Maint Pantry (Box) (like #17283 but more mergable)
 2016-05-06 20:06:04 -04:00
Jack Edge
28945b6ea5 Added maintenance fridge, mint, moved sink 2016-05-06 13:59:43 +01:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment 
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
 2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
KorPhaeron
89c3283e0f Security Lockers 2016-05-04 18:34:31 -05:00
Cheridan
23cb217905 Merge pull request #17299 from RandomMarine/mobile 
Changes locker description
 2016-05-01 22:26:15 -05:00
TechnoAlchemist
74bb2b28ab makes sure people have the right types of armor 2016-05-01 18:59:51 -07:00
TechnoAlchemist
b3286b9d39 Fixes alt sprites not working. Changes sprites of HOP armor and BARKEEP armor. 2016-05-01 18:52:12 -07:00
Joan Lung
d31f5ed876 Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt 
Security Fashion Refactor
 2016-05-01 19:33:22 -04:00
RandomMarine
ed975d5785 Nerfs closet description 2016-04-30 20:44:32 -07:00
KorPhaeron
d8db2a1643 Merge pull request #17224 from ChangelingRain/IDlock 
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
 2016-04-30 05:32:42 -05:00
TechnoAlchemist
03bce7b03d three two one let's jam 2016-04-30 03:01:38 -07:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
034500f622 Merge pull request #17188 from phil235/FixClosetStuffing 
Fixes weird shit happening when clickdragging things from your
 2016-04-28 23:49:34 -05:00
Nerd Lord
49dd259cbc Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it 2016-04-28 22:34:37 -04:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz 
Some sandbag changes
 2016-04-27 20:23:21 -04:00
phil235
fb93f88fca Fixes weird shit happening when clickdragging things from your inventory into a closet to stuff it in. You can now only stuff mobs and items into closet, and you cannot stuff things that are inside something (mostly your inventory). 2016-04-28 01:45:44 +02:00
KorPhaeron
cf08028eb0 Merge pull request #17046 from PKPenguin321/krav-sec-warden 
Gives krav maga gloves to the warden
 2016-04-27 16:09:04 -05:00
PKPenguin321
1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-26 21:49:51 +02:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
KorPhaeron
3934b7ae3d Merge pull request #17078 from ChangelingRain/opensesame 
Hitting a closet with an item will try to open it
 2016-04-25 01:00:50 -05:00
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
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
Nerd Lord
6a3f1c843a frankly, too fast 2016-04-23 21:55:15 -04:00
Nerd Lord
9fdfd4a49e Hitting a closet with an item will try to open it 2016-04-23 21:53:11 -04: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
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