cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 12:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,180 Commits 60 Branches 14 Tags
b94ce1968bb2bb40992ef93249ae5be8afee46ca
Commit Graph

15807 Commits

Author SHA1 Message Date
bgobandit
b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
 2016-05-18 03:13:37 -04:00
Joan Lung
4442614741 Merge pull request #17642 from Shadowlight213/cleanbest 
Fixes to bot scanning improvements.
 2016-05-17 23:59:13 -04:00
lordpidey
b4b93bd561 Adds new objective for devils to have X people on station be sintouched. (#17616) 
* Adds new objective for devils to have X people on station be sintouched.
Adds spell that causes nearby humans to be sintouched.
Drastically lowers chances of codex gigas sintouching it's reader.

* Fixes a runtime.
 2016-05-17 21:37:08 +01:00
Robustin
f02fb50825 Adds Hivemind Link (#17618) 
Adds Hivemind Link ability to changelings
 2016-05-17 20:42:44 +01:00
AnturK
81a10a300e Merge pull request #17633 from phil235/FingerPrince 
[s] Changes how hidden fingerprints (for admin use) work.
 2016-05-17 20:49:37 +02:00
AnturK
7a3d270889 Merge pull request #17615 from lordpidey/paperFix 
Adds literacy check to reading and writing papers.
 2016-05-17 20:29:36 +02:00
Cheridan
3e2811908f Merge pull request #17635 from MrStonedOne/patch-199 
Tesla rebalance
 2016-05-17 11:11:28 -05:00
Cheridan
33161a3814 Merge pull request #17690 from KorPhaeron/named 
Removes named zombies from gold core spawn
 2016-05-17 11:08:09 -05:00
Cheridan
31bd194f55 Merge pull request #17731 from KorPhaeron/bone 
Bone Armor Sprites
 2016-05-16 21:51:30 -05:00
Incoming5643
f14f624b8d Fixes invisible slimefolk (#17733) 2016-05-16 21:15:22 -05:00
Incoming5643
f5d58c3f72 Unborks the greentext being too greentextful (#17699) 
* Unborks the greentext being too greentextful

* W H O O P S
 2016-05-16 20:35:33 -05:00
KorPhaeron
34a7a89df1 Bone Sprites 2016-05-16 19:35:36 -05:00
Cruix
3400cf690d [s] Simple animals can no longer drag-drop people into cryo or sleepers. (#17689) 
* Simple animals can no longer drag-drop people into cryo or sleepers.

* Changed sleeper/cryo fix to use IsAdvancedToolUser()
 2016-05-16 18:47:52 -05:00
lordpidey
8b78034d1d Update paper.dm 
One line change to use usr.incapacitated() instead of several checks.
 2016-05-16 17:45:14 -04:00
Joan Lung
ef81fcb544 Merge pull request #17700 from coiax/i-require-nutrients 
Refactors need_nutrition into NOHUNGER specflag
 2016-05-16 16:37:11 -04:00
phil235
dd2c91ca64 two tiny fixes (#17658) 2016-05-16 10:03:57 -05:00
Joan Lung
f1f5f73922 Merge pull request #17661 from GunHog/Borgie_Law_Fix 
Fixes directly uploading laws to borgs
 2016-05-16 11:01:33 -04:00
Shadowlight213
7abc28cf9f Improves bot stacking resolution 2016-05-15 21:17:04 -07:00
Joan Lung
d1307bfac7 Merge pull request #17656 from KorPhaeron/swoop_cooldown 
[s] Fixes infinite swoop exploit
 2016-05-15 20:40:57 -04:00
coiax
feb02815ad Fixes #17665, abductor event finds people now (#17686) 2016-05-15 19:40:04 -05:00
Jack Edge
f5b3f3647f Refactors need_nutrition into NOHUNGER specflag 
Current human species that don't need to eat:
- Plasmamen
- Skeletons
- Agents

They now have the NOHUNGER specflag, which means their nutrition does
not decay like a baseline human's; no change in behaviour.
 2016-05-15 22:36:36 +01:00
bgobandit
eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2016-05-15 17:19:14 -04:00
Incoming5643
01ce91bf6d Specflag'd Dismemberment (#17469) 
* Adds NODISMEMBER to the species specflags to remove the var. It's not DISMEMBER because that's the default expectation and specflags need to be manually set for every race.

Merges RESISTHEAT and RESISTCOLD into RESISTTEMP. Every situation where one occurred the other did as well. It also doesn't make thermodynamic sense that something good at one wouldn't be good at the other anyways.

* T H E S E  A R E  N O T  B I T F L A G S
 2016-05-15 22:05:42 +02:00
Joan Lung
7d045c4428 Merge pull request #17622 from Robustin/ruserious 
Removes Nar-Sie from portal storm event
 2016-05-15 12:43:01 -04:00
KorPhaeron
599e4e4503 Removes named zombies from gold core spawn 2016-05-15 11:11:11 -05:00
AnturK
a9b26391e9 Merge pull request #17654 from coiax/fix-17624 
Fix #17624; shuttle loan checks for banned items
 2016-05-15 14:59:42 +02:00
AnturK
562559e2d8 Merge pull request #17652 from coiax/fix-17651 
Fixes #17651; missing limbs needed for message
 2016-05-15 14:58:24 +02:00
AnturK
e61e6c7aab Merge pull request #17422 from nullbear/blood-transfusion-fix 
Blood Type Refactor
 2016-05-15 14:55:34 +02:00
oranges
4a365aecdd improve chatter regex to prevent infinite loop 
R.find can be called repeatedly to update the R.groups and will return 0 if no match is found
 2016-05-15 20:12:17 +12:00
Kyle Spier-Swenson
5e7e773681 Makes it actually see the further away grounding rods. 2016-05-14 17:50:29 -07:00
Cruix
0a839f7461 swat mask now hides hair (#17675) 2016-05-14 19:24:39 -05:00
Iamgoofball
9f57bca8f7 Adds two alternate shuttles (#17592) 
* I got the results of the test back - I definitely have breast cancer.

* aaaaaa

* need help translating shuttle code, will pay in shitcode

* fixes

* Update emergency_imfedupwiththisworld.dmm

* Removes copyright infringement

* Update shuttles.dm
 2016-05-14 19:06:25 -05:00
TehZombehz
076fc0df79 Adds Bone Weaponry (#17672) 
* Adds Bone Weaponry

Adds Bone Spears, Axes, and Daggers, all craftable.

* '''Balance'''

I listen to the suggestions of others.

* Fixes
 2016-05-14 18:31:36 -05:00
Robustin
bb0194802f Ends traitorling + snowflake rules, totally unrelated to #17618 (#17620) 
* Snowflek-b-gone

* Traitorling gone
 2016-05-14 17:13:00 -05:00
Mercenaryblue
72ff107481 Clown Update - Golden Bike Horn (#17530) 
* Golden Bike Horn 1.0.0

Adds the golden bike horn to the game.

* Golden Bike Horn 1.0.1

Adds a deaf check

* Golden Bike Horn 1.0.2

Removed the extra bike horn sound when hitting yourself.

* Golden Bike Horn 1.0.3

flip_mobs() proc optimize the code.

* Golden Bike Horn 1.0.4

Fixes

* Golden Bike Horn 1.0.4.b

mob/user

* Golden Bike Horn 1.0.4.c

Last change

* Golden Bike Horn 1.0.4.d

No longer responsible for the lack of returns
Honk

* Golden Bike Horn 1.0.4.f

Fudge
 2016-05-14 16:11:45 -05:00
Cheridan
ba3f4f4733 Merge pull request #17634 from KorPhaeron/austurfs2 
Removes extra lines from austurfs
 2016-05-14 15:10:55 -05:00
GunHog
9786c614c1 Fixes directly uploading laws to borgs 
- Borgs without a mind do not accept attempts to relaw them.
- Fixes law board's install() proc being fed incorrect arguments.
 2016-05-14 12:16:22 -05:00
phil235
a1a9a6585b Fixes projectile destruction breaking energy guns. 2016-05-14 16:31:17 +02:00
Daturix
514047f8d8 Tesla gen to cargo orders (#17628) 2016-05-14 07:02:23 -05:00
AnturK
b694b1cbf9 Merge pull request #17136 from Razharas/HoloshitHalfFix 
Adds flag to mark items as holograms
 2016-05-14 13:53:20 +02:00
coiax
acd3eb88f5 [s] Removes another world << from stamps (#17655) 
Man, I suck at this.
 2016-05-14 06:41:13 -05:00
KorPhaeron
32a90e3a55 Swoop Cooldown 2016-05-14 06:21:20 -05:00
Jack Edge
e5639e3874 Fix #17624; shuttle loan checks for banned items 
- Shuttle now peforms standard no mobs, nuclear disks, etc. checks when
sending the shuttle for a loan to Centcom.
 2016-05-14 12:07:44 +01:00
coiax
81ffb5e385 [s] Removes debug world << from camo stamps (#17649) 2016-05-14 05:47:35 -05:00
Jack Edge
752de6d34d Fixes #17651; missing limbs needed for message 
Fleshmend now only produces a visible message if there are actually
limbs missing, where before it always triggered.
 2016-05-14 11:31:55 +01:00
Shadowlight213
b217bce30f Dont actually need this now. 2016-05-13 18:05:34 -07:00
Shadowlight213
fd6b3dc953 Makes the improved bot scanning code actually work for more than floorbots! 
Add some more checks to hopefully prevent bot stacking.
 2016-05-13 17:57:51 -07:00
Joan Lung
8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie 
Lavaland Ruins
 2016-05-13 20:22:56 -04:00
Shaps
cbc7a8b654 Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626) 
* Actually fixes announcements the right way

* Flips the SOUND_ANNOUNCEMENTS bitflag so that having it means you hear announcements

* Updates the save file version
 2016-05-14 00:55:50 +02:00
Joan Lung
c79c7f0d86 Merge pull request #17619 from phil235/FixRnDThrow 
Fix bundle. experimentor, rnd machines, mob throwing
 2016-05-13 17:36:51 -04:00