cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,211 Commits 61 Branches 14 Tags
66f67946ae885115897716cf84c19f87ade78e19
Commit Graph

3627 Commits

Author SHA1 Message Date
Xhuis
66f67946ae Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff 2015-09-21 22:18:24 -04:00
Razharas
38234c97ee Merge pull request #11798 from AnturK/displaycase 
Buildable Display Cases
 2015-09-21 22:09:10 +03:00
Razharas
836c31ac83 Merge pull request #11845 from xxalpha/nanites 
Added a self-repair module for cyborgs.
 2015-09-21 22:06:45 +03:00
Swag McYolosteinen
33b0919e7d Merge pull request #11816 from Jalleo/ImplantTrackingFix 
Improves implant tracking by using a list instead of world
 2015-09-21 18:10:38 +02:00
blah
f26f6145ac Add even more tracking fixes to improve performance 2015-09-21 17:06:11 +01:00
Xhuis
f53897523c Conflicts 2/3 2015-09-19 14:07:24 -04:00
xxalpha
204c21d287 Added a self-repair module for cyborgs. 
empty line

Changelog

Changed the module to heal more when cyborg is in critical.
 2015-09-19 18:38:24 +01:00
Remie Richards
82a79a1705 Merge pull request #11787 from bgobandit/theywanttherandd 
Adds origin tech values to a lot of items.
 2015-09-19 14:20:09 +01:00
Xhuis
af31d566b2 Syndicate medical cyborgs 2015-09-17 20:02:48 -04:00
AnturK
8067597beb Display case chasssis 2015-09-17 17:53:26 +02:00
AnturK
ac813a0ced Display cases 2015-09-17 17:53:24 +02:00
xxalpha
b119b0e113 Added a self-repair module for cyborgs. 2015-09-17 15:56:39 +01:00
Cheridan
76d1e6add5 Merge pull request #11556 from bgobandit/hardmeatspike 
MEAT SPIKE EXPANSION
 2015-09-16 20:19:42 -05:00
xxalpha
4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-16 23:14:14 +01:00
phil235
3ca12736ca Merge pull request #11700 from feemjmeem/suicides-sep10 
suicide messages for damp rag, tanks, and telebaton
 2015-09-16 23:57:51 +02:00
blah
e976aa20b4 God dammit timing is perfect for no one 2015-09-16 12:55:36 +01:00
blah
1fc4f2c5b2 Welp 2015-09-16 12:51:55 +01:00
blah
ccbbf623bb Makes it better 2015-09-16 12:42:27 +01:00
blah
d14c65d12b Improves implant tracking by having it search through a list instead of the world 2015-09-16 10:22:52 +01:00
bgobandit
0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Xhuis
1178fbe079 Major cult changes 
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
 2015-09-16 10:04:49 +12:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations 
Some dna fixes
 2015-09-15 22:31:59 +03:00
Marc R. Uchniat
4ee9e11860 telebaton and tank suicides now check for deletion properly, telebaton properly deletes brain, tank no longer drops brain 2015-09-15 10:02:46 -07:00
phil235
04287730bd Copy of Anonus' Blob tweak PR, with less commits. 2015-09-15 16:03:55 +02:00
Razharas
d42b9918b5 Merge pull request #11622 from Core0verload/matter 
Adds materials to ore
 2015-09-15 12:43:56 +03:00
Cheridan
0a8690edf0 Merge pull request #11738 from Supermichael777/detomax 
Buffs the detomax pda bomb by removing its RANDOM EXPLOSION MECHANIC.
 2015-09-14 18:37:53 -05:00
Marc R. Uchniat
a1439aaa4a make telebaton actually open if closed, add check to make sure mob still exists when you do magic to it (thanks @phil235) 2015-09-14 12:38:45 -07:00
bgobandit
aac0dd4d22 Adds origin tech values to a lot of items. 2015-09-14 14:27:01 -04:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept. 
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
 2015-09-13 22:52:38 +02:00
c0
75f2c92ebc Adds materials to ore 2015-09-13 23:37:13 +03:00
Swag McYolosteinen
b5e4eefe8b Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck 
Mop progress bar now actually works.
 2015-09-13 17:30:50 +02:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Jordie
7530c0e133 Merge pull request #11680 from bgobandit/honktarget 
Adds a clown shooting target.
 2015-09-13 21:50:53 +10:00
Fox-McCloud
ffa823e5b9 floor tile materials fixup 2015-09-12 16:11:48 -04:00
Supermichael777
a9e4af8146 it will no longer explode randomy but has a higher chance to bounce 2015-09-12 12:23:03 -04:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
Fox-McCloud
89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Marc R. Uchniat
922cd5d666 removed extraneous hgibs() call in tanks.dm, turned spaces to tabs in affected files to make remie and everyone else happy 2015-09-11 13:03:33 -07:00
Marc R. Uchniat
3e4c8ab291 tank suicide: pops you like a balloon and spits out your brain, also minor style change for consistency on telebaton 2015-09-11 11:48:30 -07:00
Marc R. Uchniat
64fd1c317c telebaton suicide: changed message, added gibs, added removal of brain 2015-09-11 11:30:36 -07:00
Razharas
3a63c31614 Merge pull request #11626 from Memendia/master 
Suicide txt fix
 2015-09-11 14:16:30 +03:00
Marc R. Uchniat
2f9cbf9536 suicide messages for damp rag, tanks, and telebaton 2015-09-10 11:44:27 -07:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
4efae3bc02 Mop progress bar now actually works. 2015-09-09 22:04:47 -04:00
bgobandit
cf42935119 Adds extra HONK. Tweaks sprite. 2015-09-09 16:27:21 -04:00
bgobandit
a8ce6c012b Adds a clown shooting target for security to unload their anger. 2015-09-09 14:35:45 -04:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
xxalpha
fda59dc3f5 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-09 02:41:34 +01:00
Memendia
046b7fbad3 I told ya 2015-09-07 03:40:07 -07:00
xxalpha
51934abbc8 Reworked nuke deconstruction. New nuke sprites. More++ 
Changelog
 2015-09-06 21:35:14 +01:00