cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,323 Commits 61 Branches 14 Tags
ea16486efdbfcbe5a7dd6aa8754e06dd833862fe
Commit Graph

907 Commits

Author SHA1 Message Date
Firecage
ea16486efd Statue fixes 2. 2014-12-27 22:24:06 +02:00
Firecage
7f1595dd7d Negligence from me. Fixed 2014-12-27 15:02:31 +02:00
Firecage
1d63ba5dec Adds some fixes to mineral statues 2014-12-27 14:55:02 +02:00
tkdrg
fc7c7b520d Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser 
Blood-red hardsuit usability feature and syndicate loadout adjustments
 2014-12-27 02:59:24 -03:00
Remie Richards
84649dacd4 Merge pull request #6339 from tkdrg/rip'd 
Ports the rapid pipe dispenser (RPD) from /vg/
 2014-12-26 23:58:17 +00:00
paprka
5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
 2014-12-26 09:09:24 -08:00
tkdrg
a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/ 
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
 2014-12-25 22:06:39 -03:00
paprka
21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi
 2014-12-25 13:51:43 -08:00
paprka
7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
paprka
1d1baa96bc Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-24 18:56:26 -08:00
phil235
70edf69f25 Fixes table having two mousedrop_T() procs. 
Adding a rack_destroy() proc.
Fixes table blob_act and ex_act a bit.
 2014-12-23 00:22:57 +01:00
paprka
47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-21 20:32:34 -08:00
paprka
f1963ce537 Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats 
Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-12-19 10:41:27 -08:00
Cheridan
566066a73a Merge pull request #6441 from paprka/corpsecthecorpening 
Corporate Security aesthetic update
 2014-12-18 02:14:33 -06:00
paprka
9d46ccceac old warden jacket for the lockers 2014-12-17 23:01:10 -08:00
Cheridan
62252f0273 Merge pull request #6420 from phil235/TypoFix2 
Fixes a lot of "the the" in messages.
 2014-12-17 16:06:35 -06:00
paprka
4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
Razharas
82654b579a Merge pull request #6395 from Steelpoint/master 
Security Beret + Jumpsuit Sprites
 2014-12-17 13:53:45 +03:00
paprka
f0d80d487d adds EMT caps 2014-12-16 21:04:27 -08:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Cheridan
79af296b6d Merge pull request #6366 from phil235/ChairSpinningFix 
Fixes not being able to rotate your chair while buckled to it.
 2014-12-16 12:27:35 -06:00
Swag McYolosteinen
2cbcda1a5f Merge pull request #5702 from Donkie/traylayer 
Morgue/Crematorium update
 2014-12-16 14:27:49 +01:00
Steelpoint
fb5eeb4265 HoP/BartenderArmor 2014-12-16 15:35:49 +08:00
Cuboos
0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 
Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt
 2014-12-15 18:12:14 -08:00
Steelpoint
4b9a87a808 MoveBeretsToSecureLocker 2014-12-15 19:46:32 +08:00
Cheridan
024817b0b2 Merge pull request #6154 from phil235/ClosetResistFix 
Fixes not being able to get out of a wrapped closet by resisting
 2014-12-15 02:53:33 -06:00
paprka
1fd9e6bfda Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/obj/gun.dmi
 2014-12-14 21:55:28 -08:00
Cheridan
7491cc38f7 Merge pull request #6346 from TZK13/Chemical-Closet-Sprites 
Adds distinct sprites for the chemical closet
 2014-12-14 23:21:04 -06:00
paprka
e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
phil235
61c8d6ab33 Fixes not being able to rotate your chair while buckled to it. 2014-12-14 18:11:49 +01:00
Daniel Hultgren
5071d307b0 Can now click switch with any object 2014-12-14 12:22:15 +01:00
paprka
303564638b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	code/game/jobs/job/security.dm
 2014-12-13 22:58:22 -08:00
paprka
db6eabfc4e intial commit for syndicate hardsuit feature 2014-12-13 22:26:09 -08:00
Razharas
bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8 
Security aesthetic overhaul
 2014-12-14 07:57:33 +03:00
TZK13
0df50e5c6e Adds distinct sprites for the chemical closet. 2014-12-13 22:04:43 -06:00
Daniel
536c0b55a5 Morgue update 2014-12-13 12:42:49 +01:00
paprka
40943d5684 reverts some sechailer and other feature things 2014-12-13 00:09:58 -08:00
paprka
868f29ada7 reverts armband change 2014-12-12 10:53:35 -08:00
paprka
76f7765c7b lockers for boxes 2014-12-11 12:13:13 -08:00
paprka
e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
paprka
dc01a092af Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi
 2014-12-10 23:55:51 -08:00
paprka
698acf1cac adds disablers to security lockers whoops 2014-12-10 01:18:02 -08:00
paprka
e53f8294d7 initial commit for nerfing ranged stuns 2014-12-10 00:16:53 -08:00
Cuboos
8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
Hornygranny
72132b1bf1 fixes whitespace 2014-12-09 16:32:16 -08:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Cheridan
d529235696 Merge pull request #6187 from phil235/GrilleWindowFix 
Fixes being able to place multiple fulltile window on a grille.
 2014-12-09 12:51:05 -06:00
Razharas
0b32dc97a7 Merge pull request #6136 from optimumtact/patch-3 
Grille throwforce is now halved against grilles, instead of -5
 2014-12-09 05:31:32 +03:00
Swag McYolosteinen
b828448645 Merge pull request #6228 from paprka/coatscoats 
Adds winter coats and changes labcoat toggling
 2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix 
Fixes ex_act() destroying too much shit
 2014-12-08 08:03:35 +01:00