cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 15:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,965 Commits 61 Branches 14 Tags
027ce2a1dfebd2fd52eee4758facec31e7d71a18
Commit Graph

2269 Commits

Author SHA1 Message Date
phil235
027ce2a1df Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure. 2014-12-14 17:32:03 +01:00
Razharas
0b26a71a71 Merge pull request #6333 from tkdrg/singulobj 
The singularity/narsie are no longer machines
 2014-12-14 10:02:39 +03:00
Razharas
bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8 
Security aesthetic overhaul
 2014-12-14 07:57:33 +03:00
paprka
3bd3175a18 Removed unused armbands 2014-12-13 00:14:03 -08:00
Cheridan
c104ad6cd4 Merge pull request #6323 from AndroidSFV/fix6313 
Fixes 6313
 2014-12-12 23:01:43 -06:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
AndroidSFV
3a0927febd Fixes 6313 2014-12-12 11:16:54 -06:00
Hornygranny
98a865298a Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/mecha/mech_fabricator.dm
 2014-12-11 13:53:37 -08:00
paprka
e9477cfe9d initial commit for better security clothing 2014-12-11 11:50:52 -08:00
Cheridan
27793609d8 Merge pull request #6201 from fleure/togglefix 
Fixes toggling watertank nozzle in hands with verb
 2014-12-11 12:21:32 -06:00
Cheridan
3ede77face Merge pull request #6189 from Menshin/exofab_revamp_end+fixes 
Exofab revamp finishing and fixes
 2014-12-11 11:52:16 -06:00
Cheridan
2619beccdf Merge pull request #6270 from optimumtact/iflashedu 
Fix flash messages when failing to flash
 2014-12-11 06:35:29 -06:00
Cheridan
ece2bb00c3 Merge pull request #6242 from Dorsisdwarf/RCDbuff 
Buffs the RCD
 2014-12-10 06:23:28 -06:00
Hornygranny
99f364f480 makes APC call parent 2014-12-09 18:53:29 -08:00
Hornygranny
f34fcd6124 overrides attack 2014-12-09 18:10:17 -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
oranges
41f0d0e04f Fix flash messages when failing to flash 
It would give the success message when flashing carbons even if the flash
had actually failed to work
 2014-12-09 09:38:26 +13: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
Dorsisdwarf
65bdf75fc0 Adds changelog and nerfs door deconstruction. 2014-12-07 11:46:59 +00:00
Remie Richards
eeea775d67 Merge pull request #6188 from tkdrg/miauwpls 
Fixes the new AI lawcap config option
 2014-12-06 23:55:15 +00:00
Dorsisdwarf
931bddc657 actually fixes the description 2014-12-06 11:41:35 +00:00
Dorsisdwarf
77106e033b Updates description and capacity variable 2014-12-06 11:38:15 +00:00
Dorsisdwarf
6149d834f7 Buffs the RCD 2014-12-06 11:24:13 +00:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Cheridan
3330b991ed Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening 
Makes dice use overlays
 2014-12-05 10:15:45 -06:00
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
fleure
3d6a4a7bfb Fixes toggling watertank nozzle in hands with verb 2014-12-03 18:58:08 +00:00
phil235
dcb48e3168 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-12-03 18:59:32 +01:00
Swag McYolosteinen
1d6a7cf031 Merge pull request #6106 from Razharas/StorageFix 
Fix for storages and equip
 2014-12-03 17:50:58 +01:00
Remie Richards
88ad308825 Merge pull request #6144 from Menshin/storage_calling_super 
Made obj/item/weapon/storage call ..() on New()
 2014-12-03 16:38:43 +00:00
Menshin
ba44b325d3 Finished the exofab revamp: 
* designs are now using the construction time var and the hacky /obj/item/mechavars is gone
* designs updated : there shouldn't be "no material" designs anymore
* cleaned the objects of their construction_cost and construction_time vars
* fixes the material name being displayed with $ character before
* this also fixes the overlay animation in inserting sheets
* the category var is now a list, so parts can be build/used with several chassis (fixes the Firefighter Chassis appearing when building Ripley)
* properly fix the href vulnerability when emptying (you can now remove all sheets of a materiel at once)
* the exofab now won't create a material sheet if there's not enough material (e.g 1000 metal)
* the exofab now won't accept a sheet if it would overstuff it (losing some material in the process)
* cleaned the code a bit (simplified, streamlined, using global vars, etc)

Finish #5722 and fixes #5954.
 2014-12-02 23:00:22 +01:00
tkdrg
6194c0b90f Fixes the new AI lawcap config option 
Previously, it would include null entries in some of the lists, which
meant that the total law amount would be grossly exaggerated.

Fixes #5846
 2014-12-02 18:27:06 -03:00
hornygranny
c683849747 Merge pull request #6160 from xxalpha/somethingsomethingreturnnull 
Fixes a couple description related issues with fancy storage
 2014-12-02 13:13:53 -08:00
Razharas
0b5ae9899e Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them 
Removes a stray /red in robot_upgrades.dm
 2014-12-02 15:54:17 +03:00
xxalpha
260ee75c9a Fixes several description related issues with fancy storage 2014-11-30 22:03:25 +00:00
Razharas
c8817469fc Merge pull request #6124 from MrPerson/eye_lmao 
Redo cyborg icon updating
 2014-11-30 22:46:37 +03:00
Menshin
efb50e374a Made obj/item/weapon/storage call ..() on New() 2014-11-30 03:14:49 +01:00
hornygranny
9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes 
Fixes pacid chem grenade runtime
 2014-11-28 16:35:01 -08:00
Razharas
da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm 
Added a cancel button to the PDA
 2014-11-28 20:52:38 +03:00
phil235
22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
Razharas
9e0d8c6ef6 Merge pull request #6094 from tkdrg/cuffmsg 
Adds some feedback messages for handcuffing
 2014-11-28 15:13:36 +03:00
MrPerson
62e9f21382 Removes a stray \red in robot_upgrades.dm 2014-11-27 23:21:35 -08:00
MrPerson
89030ad3f7 Redo cyborg icon updating 
Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons()
Removed redundant update_fire() calls
Fixes #6057 since the staff calls regenerate_icons()
 2014-11-27 23:04:35 -08:00
hornygranny
b573a00f5e Merge pull request #5918 from Razharas/Cfour 
Who am i kidding, its explosions rework for a long time already
 2014-11-27 13:58:56 -08:00
hornygranny
bc7a7a7452 Merge pull request #6084 from tkdrg/hudindahood 
Fixes data/antag HUD bugs
 2014-11-27 13:50:34 -08:00
Razharas
d2848e5f95 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-28 00:32:30 +03:00
CorruptComputer
058e342e95 Added a cancel button to the PDA 2014-11-27 14:27:00 -06:00
tkdrg
30477f00c4 Fixes pacid chem grenade runtime 2014-11-27 13:51:45 -03:00