cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,057 Commits 61 Branches 14 Tags
bb668d7ddf5384ce4e1f03253f6ec15c81176d2f
Commit Graph

10882 Commits

Author SHA1 Message Date
oranges
bb668d7ddf Remove comment and bandaid fix 2015-09-17 15:12:00 +12: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
Swag McYolosteinen
3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS 
Security Weapon Overhaul: Auto Rifle Edition
 2015-09-16 13:34:35 +02:00
Steelpoint
e51eefbe34 MoreChanges 2015-09-16 18:00:21 +08:00
Steelpoint
62e7f1204d NewChanges 2015-09-16 17:53:04 +08: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
Razharas
d42b9918b5 Merge pull request #11622 from Core0verload/matter 
Adds materials to ore
 2015-09-15 12:43:56 +03:00
Cheridan
3f3d24f063 Merge pull request #11707 from phil235/ShieldThrowTableFixes 
Shield blocking stuff
 2015-09-14 23:08:57 -05:00
Cheridan
f8d8e5e070 Merge pull request #11756 from Iamgoofball/patch-122 
Fixes #11752, resets CLF3's metab. rate to 4u instead of 0.5u
 2015-09-14 18:31:39 -05:00
Cheridan
d1e1beb713 Merge pull request #11748 from Aranclanos/pipep1 
Fixes the last remaining associative lists from pipes
 2015-09-14 18:26:46 -05:00
phil235
caaffa81dd Merge pull request #11643 from Razharas/SpaceTravel 
Implements round-randomized space map
 2015-09-14 20:37:40 +02:00
phil235
1cf98260bb Merge pull request #11742 from Aranclanos/chestAugs 
fixes chest augmentations
 2015-09-14 20:28:27 +02:00
Razharas
2f34e13177 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceTravel 2015-09-14 20:21:00 +03:00
Swag McYolosteinen
606c6e0ae4 Merge pull request #11677 from xxalpha/aliums 
Xeno tweaks and bugfixes.
 2015-09-14 17:00:14 +02:00
Jordie
41e426c5ef Merge pull request #11744 from Thunder12345/cap-uniform 
Added a new formal jacket to the captain's locker
 2015-09-14 20:36:15 +10:00
Jordie
e4979d2a90 Merge pull request #11735 from Thunder12345/cheap_tech_shells 
Removed the silver cost from techshells
 2015-09-14 20:36:08 +10:00
phil235
c9588662f7 Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after. 
Simplifies mutation overlay updating code.
 2015-09-14 00:58:25 +02: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
77787688ec fix 2015-09-13 23:47:03 +03:00
c0
75f2c92ebc Adds materials to ore 2015-09-13 23:37:13 +03:00
Thunder12345
4c64e11155 Silly line, trying to escape the delete key 2015-09-13 17:12:49 +01:00
Thunder12345
6724b7bca7 Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured 2015-09-13 17:10:30 +01:00
Remie Richards
38605d1aee Merge pull request #11712 from MrStonedOne/patch-37 
Ghost follow is now an orbit!
 2015-09-13 16:42:05 +01:00
Swag McYolosteinen
30b140ae8a Merge pull request #11603 from Fox-McCloud/stimulantsfix 
Fixes Stimulants Speedbuff
 2015-09-13 17:32:19 +02:00
Swag McYolosteinen
ed2858c2e2 Merge pull request #11737 from xxalpha/itsakindofmagic 
Fixed eye wear overriding see_invisible when it shouldn't.
 2015-09-13 17:27:19 +02:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes 
Tableclimbing & reagent runtime fixes
 2015-09-13 17:26:33 +02:00
Swag McYolosteinen
d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands 
Inhands can now come in ANY SIZE, not just 32x32!
 2015-09-13 17:23:36 +02:00
Jordie
3e6f0c87bf Merge pull request #11731 from Fox-McCloud/Impropermaterials 
Fixes Consistency Issue with Materials
 2015-09-13 23:13:22 +10:00
Jordie
e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks 
Adds boundary checks for stack sheets inserting
 2015-09-13 23:13:04 +10:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Steelpoint
5783cdda03 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-13 20:00:41 +08:00
Jordie
77911b67ba Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck 
Fixes pink slime potions.
 2015-09-13 21:59:08 +10:00
Jordie
a4549ee9b3 Merge pull request #11727 from Aranclanos/goliathstentacles 
Fixes goliath tentacles not deleting themselves
 2015-09-13 21:56:22 +10:00
Jordie
15e50de0fe Merge pull request #11694 from bear1ake/point-zero 
Remove a bunch of useless .0 in vars
 2015-09-13 21:47:09 +10:00
Jordie
6c8bb6f518 Merge pull request #11632 from bgobandit/dirtymininglies 
Fixes asteroid turfs showing up as "mineral deposit."
 2015-09-13 21:45:56 +10:00
Jordie
5a34de7bd3 Merge pull request #11699 from Incoming5643/dirtyspaceman 
Fixes lizard looking odd with helmets
 2015-09-13 21:45:44 +10:00
Jordie
47fb102125 Merge pull request #11633 from bgobandit/cocosprite 
Coffee and tea mugs now appear empty when empty.
 2015-09-13 21:44:42 +10:00
Jordie
f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem 
Added a taser function back to the Advanced Energy Gun
 2015-09-13 21:42:45 +10:00
Iamgoofball
265dadea68 Fixes #11752, resets CLF3's metab. rate to 4u instead of 0.5u 
@phil235 you forgot to keep it at 4u, which is why CLF3 does so much damage over time

it's supposed to do a lot of damage but metabolize really really fast

you accidentally made it do a lot of damage but metabolize really slowly
 2015-09-12 21:31:00 -07:00
Menshin
89ce4e112d Stored the material name in case the stack was deleted after the sleep() when dealing with overlays. 2015-09-13 01:57:21 +02:00
Aranclanos
815ef798e9 Fixes the last remaining associative lists from pipes 2015-09-12 20:57:16 -03:00
Thunder12345
cf2d0903f6 Added a new formal jacket to the captain's locker 2015-09-12 21:10:16 +01:00
Aranclanos
cb6bb99318 Readds the chest augmentation organ to the augmentation surgery, humans won't walk around chestless anymore. 2015-09-12 15:07:29 -03:00
xxalpha
701a5c7949 Fixed eye wear overriding see_invisible when it shouldn't. 
minmax
 2015-09-12 17:34:03 +01:00
Thunder12345
de156015b7 Removed the silver cost from techshells 2015-09-12 14:46:41 +01: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
Steelpoint
ae117c134b Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS 
Conflicts:
	code/game/jobs/job/security.dm
 2015-09-12 18:43:15 +08:00
Menshin
ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732) 
* Limited material inserting to stack sheets for the protolathe and banana shoes
 2015-09-12 12:11:57 +02:00
Fox-McCloud
89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00