cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 07:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,352 Commits 61 Branches 14 Tags
3d8bbbbd772a0a1f65626992c50b5d2ba80f45ce
Commit Graph

6187 Commits

Author SHA1 Message Date
Lo6a4evskiy
3d8bbbbd77 Fixed runtime 2014-10-14 12:27:05 +04:00
Remie Richards
3566e235af Merge pull request #5193 from phil235/OreBoxExFix 
Fix for #5191
 2014-10-13 11:49:41 +01:00
Remie Richards
8a0c3d81fb Merge pull request #5192 from phil235/TurbineSpriteFix 
Fix for #3612
 2014-10-13 11:49:03 +01:00
Remie Richards
6df292dfc6 Merge pull request #5178 from phil235/IanFoodFix 
Fix for #4754
 2014-10-13 11:43:51 +01:00
Remie Richards
d2646d34f2 Merge pull request #5181 from paprka/maskflippanreal 
Mask adjusting/flipping for breath and sterile masks
 2014-10-13 11:43:23 +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
1742b39b66 Merge pull request #5190 from Miauw62/CRITICAL 
Ian emotes while eating again.
 2014-10-13 10:39:24 +01:00
MrPerson
ceb045f86b Merge pull request #5174 from Jordie0608/properwordingisrealfun 
Renames Fake Explosion to Fake Nuclear Explosion
 2014-10-11 12:41:00 -07:00
Remie Richards
f673093ee5 Merge pull request #5135 from paprka/undershirtstake2 
Undershirts and jumpsuit overhaul
 2014-10-11 20:02:55 +01:00
Incoming
6a157216f9 Fixes undershirts to play nice with female uniforms. 
Generalizes and renames some things with female uniforms now that they're used for undershirts too
 2014-10-11 13:09:52 -04:00
Swag McYolosteinen
cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button 
Give implants an action button
 2014-10-11 18:15:44 +02:00
phil235
74db5df591 Adding an ex_act() proc to ore_box so the ores it contains aren't all deleted when the box is deleted by an explosion. 2014-10-11 15:42:29 +02:00
phil235
150b942d4f Fixing the lack of broken/unpowered turbine computer sprites. (replacing two unused sprites) 2014-10-11 15:22:39 +02:00
Miauw
8c626fe898 Ian emotes while eating again. Fixed #5147 2014-10-11 14:35:35 +02:00
paprka
6a2685651e cleanup 2014-10-10 16:32:09 -07:00
paprka
2df1676bd4 lots of forgotten code fixes 2014-10-10 16:25:53 -07:00
paprka
99d20ad610 remove gas mask from feature 2014-10-10 16:16:43 -07:00
paprka
39d952db7b mask adjusting 2014-10-10 16:06:15 -07: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
hornygranny
a2c3d58fea Merge pull request #5144 from Jordie0608/partsofbancodearesougly 
Removes geneticist from sci and pAI from silicon jobbans
 2014-10-10 13:53:22 -07:00
phil235
ec3c50b4c2 Prevent corgis from eating food through windows, and cats from splatting mice through windows. Also fixing cat emote for splatting mouse. 2014-10-10 21:19:43 +02: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
Jordie0608
9dfd0489d1 Renames Fake Explosion to Fake Nuclear Explosion 2014-10-11 03:06:28 +11:00
Remie Richards
d6498f2588 Merge pull request #5126 from Jordie0608/ex_act-or,exactor 
Removes telesci comp's update_icon override
 2014-10-10 15:05:44 +01:00
hornygranny
4d3e341f7f Merge pull request #5138 from paprka/HOTFIXMINING 
Hotfix for mining scanner oldcode
 2014-10-09 19:33:59 -07:00
hornygranny
c55480af16 Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay 
Stripping delay adjustments
 2014-10-09 13:46:59 -07:00
Cheridan
c9ef6e4308 Merge pull request #5128 from MrStonedOne/whyisaywhyisaythisisagoodpr 
fixes issue preventing admins from using hotkey mode
 2014-10-09 12:25:40 -05:00
Jordie0608
7c2d991c74 Removes geneticist from sci and pAI from silicon jobbans 2014-10-09 18:46:18 +11:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
hornygranny
981df33b57 Merge pull request #5129 from paprka/hospatch 
Eyepatch HUD for HoS
 2014-10-08 19:50:53 -07:00
paprka
c52916ad01 M'LADY 2014-10-08 14:48:17 -07:00
hornygranny
02d8cf4115 Merge pull request #4994 from paprka/miningainteasy 
Mining rebalancing
 2014-10-08 14:44:35 -07:00
Remie Richards
e60dda5f0e Merge pull request #5106 from paprka/megacarps 
Ports megacarps!!!
 2014-10-08 22:16:22 +01: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
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
Swag McYolosteinen
8589c8c874 Merge pull request #5120 from nivomi/turretsounds 
Make spawned turrets use projectile-appropriate SFX
 2014-10-08 20:57:21 +02:00
paprka
4c78323aa0 conflict resolution 2014-10-08 11:38:03 -07:00
paprka
67dd029fe0 updated sprites, grey stuff 2014-10-08 10:38:24 -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
8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Lo6a4evskiy
98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
 2014-10-08 16:45:22 +04:00
paprka
d80be7f689 changes robotics gloves to fingerless gloves 2014-10-08 05:11:30 -07:00
Remie Richards
7892359207 Merge pull request #5114 from hornygranny/fatstacks 
can no longer stack resin structures
 2014-10-08 10:21:49 +01:00
Remie Richards
8503bd632b Merge pull request #5103 from paprka/largebow 
Readds large crossbow to protolathe
 2014-10-08 10:18:51 +01:00
hornygranny
c28dd40190 Merge pull request #5085 from paprka/WYATTSHIELDS 
Adds telescopic riot shields
 2014-10-07 21:13:03 -07:00
paprka
f92e08d6a8 revert borg nerf 2014-10-07 20:34:28 -07:00
hornygranny
bb3fe4ed52 Merge pull request #5077 from Steelpoint/DeathSquad 
Deathsquad Armour Buff
 2014-10-07 20:00:57 -07:00