cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,532 Commits 61 Branches 14 Tags
74dfbeb92c4e468f9bb92aae2fcfeb42b7b57342
Commit Graph

699 Commits

Author SHA1 Message Date
paprka
74dfbeb92c adds bomber and leather jackets 2014-10-20 21:36:40 -07:00
Cheridan
455b526cc1 Merge pull request #5318 from phil235/MsgFix2 
More messages fixed
 2014-10-19 21:39:06 -05:00
Cheridan
4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher 
Fixes cyborgs being able to add their flashes to things
 2014-10-19 17:44:30 -05:00
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
phil235
9b9481d65c Changes many span classes. 
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
 2014-10-18 16:00:38 +02:00
Swag McYolosteinen
fdde99e3ca Merge pull request #5239 from tkdrg/sanictoobs 
Makes transit tubes a lot faster
 2014-10-18 09:54:48 +02:00
paprka
8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt 
Conflicts:
	icons/mob/uniform.dmi
 2014-10-16 21:29:10 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits 
Adds Construction Permits
 2014-10-17 05:24:37 +01:00
Cheridan
17c9aaa6dd Merge pull request #5263 from Aranclanos/electropackrevamp 
Electropack fixes
 2014-10-16 08:08:57 -05:00
tkdrg
1ed1c6f40b Changed breakout times to use the new constants 2014-10-15 11:40:25 -03:00
tkdrg
e9f418d568 Merge branch 'master' into sanictoobs 2014-10-15 11:39:27 -03:00
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety 
Adds click cooldown to clicking on mobs Fixes #4812 Take2
 2014-10-15 11:03:02 -03:00
Remie Richards
7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed 
Collapsible Rollerbed
 2014-10-15 11:54:48 +01:00
Aranclanos
a1d49cfeb4 Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack. 
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
 2014-10-14 21:44:56 -03:00
tkdrg
c6ba2b5c22 Shortens stopped tube time and cleans up a bit 2014-10-14 14:14:58 -03:00
tkdrg
c6d5a44269 Makes transit tubes a lot faster 2014-10-13 19:55:30 -03:00
paprka
20d6524945 cleaned up code and added orange jumpsuits 2014-10-13 15:36:50 -07:00
phil235
cf40b75313 fixing typo 2014-10-13 18:52:13 +02:00
phil235
619a38ad89 Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag. 2014-10-13 17:17:53 +02:00
Remie Richards
07b621421c Merge pull request #5196 from phil235/grammarFix1 
Small grammar fix.
 2014-10-13 11:41:45 +01:00
Remie Richards
399977d882 Merge pull request #5095 from MrPerson/table_module 
Move table crafting into the modules folder plus improvements
 2014-10-13 10:42:16 +01:00
Remie Richards
20c6f4cbac Merge pull request #5173 from paprka/knocky 
Unique sound for knocking on glass with bare hand/TK
 2014-10-12 20:50:57 +01:00
Swag McYolosteinen
816cc598ce Merge pull request #5155 from tkdrg/tubemagic 
Transit tube construction bugfix
 2014-10-12 10:09:03 +02:00
Cheridan
5eb6a82970 Merge branch 'master' of https://github.com/tgstation/-tg-station into permits 
Conflicts:
	icons/obj/items.dmi
 2014-10-11 17:48:46 -05:00
Cheridan
84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
Remie Richards
f673093ee5 Merge pull request #5135 from paprka/undershirtstake2 
Undershirts and jumpsuit overhaul
 2014-10-11 20:02:55 +01:00
phil235
3d0778e873 Small grammar fix. 2014-10-11 17:44:54 +02:00
Swag McYolosteinen
cd78d2eb37 Merge pull request #4863 from Menshin/girders_building_consistency 
Consistency fix for disloged girders securing and building on
 2014-10-11 13:41:18 +02:00
MrPerson
863f28f295 On second thought, leave the result as just a path 
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-10-10 14:30:41 -07:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff 
Adds holographic janitor signs
 2014-10-10 17:41:41 +01:00
Remie Richards
afb0808748 Merge pull request #5133 from paprka/glovestation 
Changes robotics gloves to fingerless gloves
 2014-10-10 17:26:40 +01:00
paprka
bfa448864b Added unique sound for knocking on glass 2014-10-10 09:07:23 -07:00
tkdrg
cc5a29b9fb Fixes tube pod decon & gives tubes two spin dirs 2014-10-09 19:18:35 -03:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
hornygranny
981df33b57 Merge pull request #5129 from paprka/hospatch 
Eyepatch HUD for HoS
 2014-10-08 19:50:53 -07:00
Francis Devine
5595d57f57 Add the click cooldown define to the last special defines 
This will stop these getting out of sync and let you change
all times with a single define
 2014-10-09 14:52:47 +13:00
Francis Devine
f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
Remie Richards
23651b54f0 Merge pull request #5093 from paprka/medipens 
Replaces a lot of inaprovaline syringes with medipens
 2014-10-08 22:15:52 +01:00
paprka
5457503c67 adds holographic janitor signs 2014-10-08 13:48:44 -07:00
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka
4c78323aa0 conflict resolution 2014-10-08 11:38:03 -07:00
paprka
b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07:00
paprka
18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2 
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
 2014-10-08 09:48:49 -07:00
paprka
668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-08 07:17:42 -07:00
paprka
d80be7f689 changes robotics gloves to fingerless gloves 2014-10-08 05:11:30 -07:00
Remie Richards
f5e54f1fa8 Merge pull request #5069 from phil235/WindoorDeconstruction 
Adds windoor deconstruction & bug fixes
 2014-10-08 10:27:45 +01:00
hornygranny
c28dd40190 Merge pull request #5085 from paprka/WYATTSHIELDS 
Adds telescopic riot shields
 2014-10-07 21:13:03 -07:00
paprka
216682bccf eyepatch HUD 2014-10-07 19:18:18 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
paprka
0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00