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

15548 Commits

Author SHA1 Message Date
Razharas
7041877ebd Merge pull request #18544 from ChangelingRain/runecolor 
The Summon Nar-Sie rune is now colored right when invoked.
 2016-06-15 02:08:35 +03: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
Joan Lung
58622c3cc1 actual fix, ho 2016-06-14 18:04:34 -04: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
oranges
4c67fca7ea Merge pull request #18529 from ChangelingRain/firsttrueuseofsetDir 
Chairs now handle layer updates/rotation with setDir
 2016-06-14 15:24:47 +12:00
oranges
ec50fbdc9f Merge pull request #18499 from tgstation/RemieRichards-infbuckle 
Fixes infinite buckling, removes unnecessary list init.
 2016-06-14 09:23:30 +12:00
oranges
0ec02030c8 Merge pull request #18515 from ChangelingRain/clockworkpower 
Clockwork airlocks and windoors are always powered
 2016-06-14 09:23:06 +12:00
bgobandit
7f42a30ecf Cloning autoprocess now checks to make sure the clone pod is powered. (#18496) 2016-06-13 14:16:51 -05:00
Joan Lung
ebc88de594 You can't convert the dead with Guvax (#18513) 
* You can't convert the dead with Guvax

* living
 2016-06-13 14:14:53 -05:00
Joan Lung
293cce1649 The Summon Nar-Sie rune is now colored right when invoked. 2016-06-13 11:47:25 -04:00
Joan Lung
360ee8bf78 Fixes some grammar (#18514) 2016-06-13 10:21:16 -05:00
Joan Lung
73ed4beda3 Scriptures in Recital have a simple description (#18521) 
* Scriptures in Recital have a simple description

* short names

* info

* haha
 2016-06-13 10:19:22 -05:00
Jordie
c1a5978bf1 Merge pull request #18502 from ChangelingRain/arkofjustice 
Nerfs the Gateway to the Celestial Derelict summon time
 2016-06-14 01:15:59 +10:00
c0
4d01e17ba0 Refactors mech directional armor 2016-06-13 17:07:21 +03:00
Joan Lung
59b26e9715 properly 2016-06-13 09:43:01 -04:00
Joan Lung
63998cb55d Can't use door remotes on doors you can't use 2016-06-13 08:30:00 -04: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
Joan Lung
8582d0fbbd Chairs now handle layer updates/rotation with setDir 2016-06-12 22:56:41 -04: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
Razharas
89649091cd Merge pull request #18482 from ChangelingRain/sigilofcession 
Nerfs Sigils of Transgression/Submission
 2016-06-13 00:37:29 +03: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
Joan Lung
3dbd593882 Clockwork airlocks and windoors are always powered 2016-06-12 17:19:44 -04:00
Xhuis
39cf109cdb Prevents drone conversion 2016-06-12 16:47:00 -04:00
Razharas
9dc6687ca2 Merge pull request #18477 from ChangelingRain/talismansanity 
Talisman creation runes now require that the target paper doesn't move and still exists
 2016-06-12 23:12:21 +03:00
Joan Lung
ba2178912d done 2016-06-12 15:49:55 -04:00
Joan Lung
deb88e3b48 Lava no longer smooths with solid walls but will still smooth with mineral walls (#18475) 
* Lava no longer smooths with solid walls but will still smooth with mineral walls

* bleh bleh why are these a subtype of floors
 2016-06-12 10:36:59 -05:00
Joan Lung
8b44edac79 redundant 2016-06-12 10:37:23 -04:00
Joan Lung
bbf29a722c vnjvstice 2016-06-12 10:32:29 -04:00
Joan Lung
18c533d636 Nerfs the Ark of the Clockwork Justicar summon time 2016-06-12 10:28:36 -04:00
Remie Richards
87bba48cb5 Fixes infinite buckling, removes unnecessary list init. 2016-06-12 14:35:14 +01: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
b20a5642de Merge pull request #18473 from RemieRichards/setDir() 
Set dir()
 2016-06-13 00:03:44 +12:00
oranges
ed2a80951e Merge pull request #18441 from Xhuis/brash_gold 
Makes Nar-Sian magic more effective against servants
 2016-06-13 00:01:35 +12:00
oranges
11c76f5bd7 Merge pull request #18444 from xxalpha/spesstiem 
Wizard Spell: Spacetime Distortion
 2016-06-13 00:01:23 +12:00
oranges
a37b08c53d Merge pull request #18449 from xxalpha/fucklizard 
L A R G E Graffiti YIFF IN HELL AND OTHERS
 2016-06-13 00:00:33 +12:00
oranges
d0c31c3f99 Merge pull request #18456 from ChangelingRain/finitemarauder 
Clockwork marauders will now die when their host does
 2016-06-12 23:59:32 +12:00
oranges
07a2b70f4b Merge pull request #18460 from ChangelingRain/informedpariah 
Fixes targeted scripture not allowing valid name input
 2016-06-12 23:59:13 +12:00
oranges
e594dc34ff Merge pull request #18462 from Niknakflak/MUSIC_AND_GUITARS_AND_STUFF_SHREDDING_YEA_FUCKING_FIXES_YEA_SOUND_WOO 
Add an electric guitar and removes duplicate guitar sound files
 2016-06-12 23:58:10 +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
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Xhuis
6dc183770c Reverts the changes to "is_eligible_servant(M)" 2016-06-11 23:47:30 -04:00
Xhuis
413b70c248 Fixes my PR 2016-06-11 21:51:30 -04:00
Xhuis
d389754b89 Prevents drone conversion 2016-06-11 21:25:48 -04:00
Joan Lung
c60efc988c process no processing 2016-06-11 18:47:04 -04:00