cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,280 Commits 61 Branches 14 Tags
b9f4a54c56bc00a3b681dcdeb5414ec83f6281d7
Commit Graph

3369 Commits

Author SHA1 Message Date
Remie Richards
b9f4a54c56 Merge pull request #5132 from paprka/tacticool 
Changes HUD in syndicate medkit to NV HUD
 2014-10-10 17:29:18 +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
hornygranny
c55480af16 Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay 
Stripping delay adjustments
 2014-10-09 13:46:59 -07:00
Swag McYolosteinen
7d11253f39 Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti 
Choosing graffiti instead of drawing random one
 2014-10-09 16:31:13 +02: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
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
16a0f12ffe fixes name stuff 2014-10-08 13:33:17 -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
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
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
703c73247e changes HUD to NV HUD 2014-10-07 20:37:11 -07:00
hornygranny
b124e4ac41 Merge pull request #5119 from paprka/arcwelder 
Welding tool sprite updates
 2014-10-07 20:12:30 -07:00
hornygranny
e611301f0f Merge pull request #5044 from Jordie0608/mapmergersoannoying 
Fixes #4788 Resin walls on the abandoned mining station
 2014-10-07 19:39:12 -07:00
paprka
060c64b854 breakouttime increased to 45 sec 2014-10-07 19:30:02 -07:00
paprka
216682bccf eyepatch HUD 2014-10-07 19:18:18 -07:00
MrPerson
9797435df7 Merge pull request #5109 from paprka/telebatonstorage 
Telebaton storage tweak
 2014-10-07 14:25:56 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Cheridan
598ef16d29 Merge pull request #5107 from tkdrg/borg_cult 
Fixes restarted borgs hearing cult chat
 2014-10-07 08:06:47 -05:00
Jordie0608
208b136996 Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-07 21:56:06 +11:00
Lo6a4evskiy
18ad0292c3 fixed compilation errors 2014-10-07 12:47:53 +04:00
Lo6a4evskiy
41eb04356f Merge remote-tracking branch 'upstream/master' into Custom_graffiti 
Conflicts:
	code/game/objects/effects/decals/crayon.dm
 2014-10-07 12:43:59 +04:00
Lo6a4evskiy
01ae516481 Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
 2014-10-07 12:38:47 +04:00
paprka
01d69299eb changelog and consistency name fix 2014-10-06 21:21:03 -07:00
paprka
969e7f895b cutt off 2014-10-06 20:51:51 -07:00
paprka
0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00
paprka
1aff1d6c20 welding tool updates 2014-10-06 18:04:47 -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
paprka
d6a8e0de09 code nitpicking (thanks remie) 2014-10-06 12:39:15 -07:00
Lo6a4evskiy
61937c8dae Changed strip delays for most clothes 2014-10-06 19:42:12 +04:00
Remie Richards
5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man 
Updates spiders to have full player functionality
 2014-10-06 14:24:39 +01:00
Remie Richards
304a865ff7 Merge pull request #5089 from tkdrg/tubesarecool 
Constructable transit tubes!
 2014-10-06 14:22:22 +01:00
Remie Richards
acf5bee200 Merge pull request #5092 from Cheridan/flashing 
Flash Changes
 2014-10-06 14:10:31 +01:00
paprka
7c95d3b79b stupid compile errors 2014-10-06 00:45:22 -07:00
paprka
89795c95bf telebaton storage 2014-10-05 23:10:55 -07: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
Cheridan
df8dc6d119 Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing 2014-10-05 19:24:49 -05:00
tkdrg
a7f62f6d7c Fixes restarted borgs hearing cult chat 2014-10-05 20:21:21 -03: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