cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-07 06:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,647 Commits 63 Branches 14 Tags
d191efc751ed3ec43ebe1d4c840540c1095db152
Commit Graph

6895 Commits

Author SHA1 Message Date
KorPhaeron
d191efc751 Merge pull request #17329 from Cheridan/scavengers 
Ashwalker Den Update
 2016-05-03 03:01:50 -05:00
Cheridan
e64783c1fa Merge pull request #17282 from coiax/brobot-is-an-artist 
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
 2016-05-03 01:55:01 -05:00
KorPhaeron
423ee67c73 Merge pull request #17330 from coiax/lavaproof-staff 
Staff of lava is now lavaproof
 2016-05-03 01:03:46 -05:00
AnturK
340b1d01ff Merge pull request #17314 from RemieRichards/mecha_pilot_fix 
Mecha and Mecha pilot fixes
 2016-05-02 20:25:44 +02:00
Remie Richards
bc754a7bfc Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot. 2016-05-02 17:18:34 +01:00
AnturK
878d76a4b7 Merge pull request #17062 from Core0verload/bloodbrood 
New function for hivelord core / legion heart
 2016-05-02 11:39:18 +02:00
Jack Edge
292901357e Staff of lava is now lavaproof 
Staff of lava is now lavaproof.
 2016-05-02 09:07:47 +01:00
Cheridan
6db3624cf8 Ashwalker Scavengers 2016-05-02 02:45:39 -05:00
Cheridan
08579759fb Merge pull request #17296 from ChangelingRain/justwatch 
Watchers now instantly fire at targets instead of setting temperature
 2016-05-01 23:30:25 -05:00
Cheridan
009988b553 Merge pull request #17292 from erwgd/PlasmamanStartInternalsOn 
When joining game as plasmaman, start with internals on
 2016-05-01 21:58:30 -05:00
Remie Richards
77c7640139 fixes some vars on /nanotrasen pilots 2016-05-01 21:25:35 +01:00
Remie Richards
00bdc99254 fixes mecha_pilots not targeting empty mecha correctly, fixes them attacking friendly/their own mecha, adds nanotrasen mecha_pilots. 2016-05-01 19:32:15 +01:00
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Joan Lung
72f25a53e6 Merge pull request #17277 from KorPhaeron/cyborg_buffs2 
Cyborg Blueprints
 2016-05-01 11:05:48 -04:00
c0
20c64fbfbf Blood brood 2016-05-01 17:19:29 +03:00
Cheridan
70d1ecfb68 Fixing conflicts 2016-05-01 04:11:21 -05:00
Cheridan
3981f27e3d Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	icons/mob/animal.dmi
	icons/mob/mob.dmi
 2016-05-01 04:06:26 -05:00
Cheridan
0a45f89bdc Finishes scavengers 2016-05-01 03:51:25 -05:00
Jordie
d0dcd62e87 Merge pull request #17268 from Core0verload/grubgrub 
Goldgrub no longer can burrow into the station floor
 2016-05-01 17:50:09 +10:00
Jordie
265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit 
View vars will now tell you if something has been previously var edited
 2016-05-01 17:02:02 +10:00
Jordie
98655ac6e8 Merge pull request #17219 from TrustyGun/lavaland_cuisine 
Adds Stuffed Legion
 2016-05-01 16:59:11 +10:00
Jordie
f3f0c63e4f Merge pull request #17245 from nullbear/c4-path 
Changes C4 Path and adds X4 breaching charge
 2016-05-01 16:41:07 +10:00
Nerd Lord
c6f8eb6ee5 Watchers now instantly fire at targets instead of setting temperature 2016-04-30 21:27:08 -04:00
erwgd
8a4319c78b added code which sets internals on to plasmaman/before_equip_job 2016-05-01 01:07:54 +01:00
Joan Lung
43ada53037 Merge pull request #17272 from KorPhaeron/dragon 
Fixes Dragon Explosion Log Spam
 2016-04-30 15:04:54 -04:00
Jack Edge
51d3dc9242 Hand labeler 2016-04-30 18:44:01 +01:00
Jack Edge
3d458b857c Service cyborgs get a spraycan 
🆑 coiax
rscadd: The Service cyborg module now has a spraycan built in, for
hijinks and passing on important urban messages.
/🆑
 2016-04-30 15:26:22 +01:00
Cheridan
55514c3be6 Merge pull request #17233 from coiax/mining-item-stats 
Added more stat tracking to mining items and engine generation
 2016-04-30 08:21:41 -05:00
phil235
84dcf0dd3f dammit. 2016-04-30 12:33:12 +02:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib 
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-30 12:30:36 +02:00
TrustyGun
9feb71f7a6 move legion skull to mining.dmi 2016-04-30 06:03:12 -04:00
TrustyGun
837739df65 Merge branch 'master' of https://github.com/tgstation/-tg-station into lavaland_cuisine 2016-04-30 05:52:50 -04:00
KorPhaeron
946fac13dd Cyborg Blueprints 2016-04-30 03:47:51 -05:00
KorPhaeron
f4f6a64a1c Fixes Dragon Log Spam 2016-04-30 02:03:30 -05:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake 
Revert "Move some stuff from different layers to different planes"
 2016-04-30 15:34:17 +10:00
c0
2a8faf099b Goldgrub no longer can burrow into the station floor 2016-04-30 07:12:02 +03:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
Cheridan
34dd0e5b02 Merge pull request #17018 from KorPhaeron/megafauna 
Megafauna
 2016-04-29 20:27:21 -05:00
KorPhaeron
209a3d3e8e Legion is behind the door 2016-04-29 19:42:20 -05:00
KorPhaeron
eecd2942b3 Fixes dragon spamming explosion logs 2016-04-29 17:13:34 -05:00
Cheridan
4bbdeaa9fa Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 2016-04-29 17:06:53 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
KorPhaeron
29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks 
Fixes? Catsploision? [Maybe?]
 2016-04-29 11:18:24 -05:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake 
Move some stuff from different layers to different planes
 2016-04-29 15:51:41 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult 
The Cult Rises...
 2016-04-29 15:10:16 +03:00
nullbear
5cd0cca621 Adds more reuseable c4 type path. Adds x4. Fixes chembomb recipe. 2016-04-29 03:31:17 -07:00
Jack Edge
fd8f0e425f Added statistics to mining and lavaland 2016-04-29 09:40:12 +01:00