cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,710 Commits 61 Branches 14 Tags
7041877ebdfd6600a563b176374a2ad925edee52
Commit Graph

16543 Commits

Author SHA1 Message Date
oranges
da0c7f2dae Revert "Remove syndicate buff slipped into a pr without a description" 
Is there egg on my face or what
This reverts commit 65a0b5dc97.
 2016-06-14 22:54:38 +00:00
oranges
65a0b5dc97 Remove syndicate buff slipped into a pr without a description 2016-06-15 10:49:15 +12:00
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack 
Brings back CE's hardsuit jetpack
 2016-06-15 10:44:59 +12:00
oranges
9c451faa2c Merge pull request #18534 from Core0verload/ash_fix 
Fixes unkillable ash drake (+ more runtime fixes)
 2016-06-15 10:44:20 +12:00
Cheridan
70ca753d36 Merge pull request #18548 from GunHog/Bot_Say_Fix 
Fixes bot speech
 2016-06-14 17:02:30 -05:00
coiax
9af9db4800 Fixes countdown moving in space wind (#18542) 
The countdown was being blown about by atmos stuff, and then moved back
each tick. It was amusing to look at, but ultimately, is a bug that
needs fixing.
 2016-06-14 11:44:17 -05:00
GunHog
3ddd840268 Mining Cyborg GPS (#18543) 
- Adds a GPS tool to mining cyborgs.
 2016-06-14 11:44:02 -05:00
lordpidey
31cb7b861a Adds devil spawning event. (#18530) 
Adds new event, in which a devil will be spawned, event does not occur naturally and must be admin triggered
 2016-06-14 15:51:28 +12:00
lordpidey
f640d7ddb7 Devil fixes (#18520) 
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
 2016-06-14 15:43:33 +12:00
KorPhaeron
11c42547d2 Too strong (#18487) 2016-06-14 15:23:08 +12:00
PKPenguin321
1bb13e13da fixes spacetime distortions moving through spacetime (#18527) 
fixes spacetime distortions moving through spacetime by anchoring them
 2016-06-14 14:18:15 +12:00
GunHog
c3cbea445e Bot Data HUD tweaks (#18505) 
Security bots now have a security HUD
Other bots have a Diagnostic HUD
Fixes Medical HUD not working for Medibots Fixes #17127
 2016-06-14 12:26:21 +12:00
kevinz000
d3f25c53f3 Gravgun Tweaks (#18504) 
R&D lathe cost slightly upped
Added new "chaos" mode which randomly tosses shit around ("""randomly""")
NEW INHAND SPRITES ARE IN
FIXED THE BUG THAT LEAD TO INFINITE RECURSION AND CRASHED MC
 2016-06-14 12:25:56 +12:00
oranges
7033fd08b0 Merge pull request #18488 from Core0verload/rnd_skip 
Brings back RnD level skipping
 2016-06-14 09:29:18 +12:00
oranges
f2790ba712 Merge pull request #18498 from KorPhaeron/megafauna2 
Fixes megafauna being immune to severity 1 explosions
 2016-06-14 09:22:24 +12:00
Joan Lung
d7b9d755c2 Merge pull request #18511 from lordpidey/closing_the_door_on_bugs 
bolts of door creation can no longer destroy indestructible walls
 2016-06-13 17:20:16 -04:00
GunHog
16cad168a2 Fixes bot speech 
Bots now always have their robot spans.
 2016-06-13 16:06:17 -05:00
KorPhaeron
8dddcacf67 Whoops 2016-06-13 06:45:58 -05:00
AnturK
50807d454b Merge pull request #18494 from phil235/BlastDoor 
Blast door fix and ling limb regen
 2016-06-13 12:45:56 +02:00
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
c0
5ce52dbcb3 Fixes unkillable ash dragon 2016-06-13 12:17:57 +03:00
oranges
eb30d5c84e Merge pull request #18242 from LatD/machineprototype 
Item to cargo for R&D engineering tech
 2016-06-13 14:08:05 +12:00
oranges
314c6846d3 Merge pull request #18483 from Xhuis/when_i_say_ill_do_something_i_do_it 
Adds caks
 2016-06-13 14:06:55 +12:00
oranges
17c9a665de Merge pull request #18485 from Incoming5643/jersey_uprising 
Repairs Spray Tan
 2016-06-13 14:05:29 +12:00
Kyle Spier-Swenson
2be36ce8cc fixes shuttle rotation 2016-06-12 18:26:34 -07:00
Xhuis
295085f014 Heavily nerfs cak health 2016-06-12 19:01:54 -04:00
Xhuis
c095b2f976 Mind transfer and stat increase 2016-06-12 18:14:34 -04:00
oranges
d7c748a558 Merge pull request #18472 from phil235/HackyShit 
Fixes Synths
 2016-06-13 09:24:52 +12:00
Joan Lung
b689959a13 Merge pull request #18465 from Xhuis/left_laborer 
Two small clock cult fixes and a tweak
 2016-06-12 17:21:19 -04:00
Mike Long
a2b3276f63 bolts of door creation can no longer destroy indestructible walls 2016-06-12 15:59:22 -04:00
KorPhaeron
b3b9e8b69e Fix 2016-06-12 09:39:00 -05:00
KorPhaeron
1f8cb5ef5e Megafauna bomb resist 2016-06-12 08:24:43 -05:00
Joan Lung
80f762c4f8 FALSE 2016-06-12 09:00:19 -04:00
Joan Lung
84a6edf527 Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration 
Conflicts:
	icons/effects/blood.dmi
 2016-06-12 08:37:13 -04:00
oranges
99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit 
Moving code around
 2016-06-13 00:14:29 +12:00
oranges
6eea6b4779 Merge pull request #18466 from Core0verload/proto_fix 
Fixes protolathe not accepting any reagents
 2016-06-13 00:08:14 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir() 
Set dir()
 2016-06-13 00:03:44 +12:00
oranges
fa9b86e64f Merge pull request #18458 from Razharas/KudzuFix 
Refactors kudzu on_hit processing, fixes bug
 2016-06-13 00:02:03 +12:00
oranges
11c76f5bd7 Merge pull request #18444 from xxalpha/spesstiem 
Wizard Spell: Spacetime Distortion
 2016-06-13 00:01:23 +12:00
Jordie0608
0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
phil235
6227762d9b Fixes blast doors not being crowbarrable when out of power. 
Changeling regenerative stasis now regenerate limbs, except the head.
 2016-06-12 12:45:07 +02:00
Xhuis
25a638d6af Removes cherry bombs (#18461) 2016-06-12 02:01:16 -05:00
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
c0
8a5f46a859 Brings back RnD level skipping 2016-06-12 09:02:30 +03:00
Incoming
3e05af6492 repairs the rare orange skintone 2016-06-11 22:08:56 -04:00
Xhuis
e2cef7fca4 Fixes infinite donut duping 2016-06-11 21:11:15 -04:00
Xhuis
e467734e1f Adds caks 2016-06-11 20:23:40 -04:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
phil235
dccc1e60a3 Let's not forget the new files. 
Also some tiny fixes, typo, and things I forgot.
 2016-06-11 23:52:35 +02:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..() 
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
 2016-06-11 23:18:26 +02:00