cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,321 Commits 61 Branches 14 Tags
552755ffbc10ede4c843ce9b237c8a333116fde7
Commit Graph

670 Commits

Author SHA1 Message Date
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
Remie Richards
f673093ee5 Merge pull request #5135 from paprka/undershirtstake2 
Undershirts and jumpsuit overhaul
 2014-10-11 20:02:55 +01: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
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
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
Cheridan
66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
 2014-10-06 19:27:14 -05:00
Remie Richards
ea4e6f823c Merge pull request #5051 from paprka/rollingjsuit 
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
 2014-10-06 20:45:28 +01:00
Remie Richards
175d42061c Merge pull request #5088 from paprka/syndiesheet 
Syndicate mother base/ship changes
 2014-10-06 20:44:02 +01:00
Remie Richards
304a865ff7 Merge pull request #5089 from tkdrg/tubesarecool 
Constructable transit tubes!
 2014-10-06 14:22:22 +01:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor 
Change examine() from an atom verb to a mob verb
 2014-10-05 23:37:34 -05:00
tkdrg
4ef2e494a1 Changes flip/rotation, better diagonal handling 2014-10-05 14:09:10 -03:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00
tkdrg
0c9c9c8b0a Reduces decon time to 35 and adds a missed init_dirs 2014-10-05 08:46:34 -03:00
phil235
e1c0351e16 Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmadoorfix 
Conflicts:
	code/game/machinery/doors/airlock.dm
 2014-10-05 13:24:14 +02:00
paprka
1bb6603ff4 replaces a lot of inaprov syringes with medipens 2014-10-04 22:03:09 -07:00
Cheridan
fb7aff426d Merge pull request #5039 from paprka/hatstation13 
Some job-specific hat rebalancing
 2014-10-04 20:51:08 -05:00
tkdrg
d7937fcd1a This comment was supposed to be deleted 2014-10-04 21:58:12 -03:00
paprka
2257c8f985 new syndicate map changes 2014-10-04 17:40:28 -07:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
tkdrg
d0ce2a848d First iteration of constructable transit tubes 2014-10-04 21:18:41 -03:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
paprka
6d4fb1483a adds telescopic riot shields 2014-10-04 15:58:27 -07:00
Cheridan
3b150a0249 Merge pull request #5012 from phil235/APCFix 
APC/airlocks/alarms fixes
 2014-10-04 11:42:45 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
phil235
a1475c7bf1 Correcting a naming problem. 2014-10-03 17:35:21 +02:00
paprka
0b605e7bdf more NT ports 2014-10-01 18:36:57 -07:00
paprka
822613d698 remove helmet pathing 2014-10-01 15:01:36 -07:00
phil235
47521d5081 More windoor bug fixes. You can no longer build two windoors on top of each other. You can make a windoor_assembly w/ rglass on the same tile as another one as long as they have different directions. 2014-09-30 23:05:18 +02:00
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
paprka
a499710081 hat rebalancing 2014-09-30 13:08:13 -07:00
phil235
b53c96d08f windoor deconstruction plus many fixes. See description. 2014-09-30 21:17:07 +02:00
phil235
c6c2074899 many fixes. see description. 2014-09-28 19:46:52 +02:00