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
36,212 Commits 61 Branches 14 Tags
ee3ce06a506dfd0ffec8eabfc4d4b4379b012b44
Commit Graph

16728 Commits

Author SHA1 Message Date
oranges
ca5a7f50c7 Merge pull request #18837 from SnipeDragon/dev2 
Guest keys no longer trigger findJoinDate (Fixes #18749)
 2016-06-24 09:34:25 +12:00
bawhoppen
40f68a409f fixes magnet (#18867) 2016-06-23 11:52:52 -04:00
oranges
ddaeb722ca Merge pull request #18810 from coiax/vital-changes 
Butterflies and cats
 2016-06-23 15:07:06 +12:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Jack Edge
dc7c591748 Code review 2016-06-23 00:40:28 +01:00
Jack Edge
5f9553163c Butterflies and cats 
- Butterflies now "flutter" rather than say
- Admins have gained Admin->Secrets->Fun->Mass Purrbation
- Plus new cat sound effect.
 2016-06-23 00:37:15 +01:00
oranges
8b29e3e049 Merge pull request #18677 from coiax/cellular-emporium 
Changling evolution menu becomes cellular emporium
 2016-06-23 10:06:51 +12:00
oranges
81da43bdc5 Merge pull request #18790 from tgstation/RemieRichards-disappointed 
Venus human trap changes
 2016-06-23 10:05:39 +12:00
Incoming5643
b622d10ecb Fixes three problems of my own identification/invention (#18824) 
* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.

* I failed a spot check
 2016-06-22 17:03:09 -05:00
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
Cheridan
a6fc773540 Merge pull request #18723 from coiax/pond-skipping 
Adds visible ripples indicating shuttle's transit
 2016-06-22 11:24:44 -05:00
SnipeDragon
ef2bb16777 findJoinDate only procs if a client is not a Guest and the DB is connected. As Jordie requested. 2016-06-22 06:33:32 -05:00
SnipeDragon
8bdf81ff84 Guest keys no longer trigger findJoinDate (Fixes #18749) 2016-06-22 06:00:21 -05:00
Faltnor
d950565a3f Make Staff of Honkmother slightly less OP (#18802) 
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
 2016-06-22 03:23:05 -05:00
Cheridan
7ab8f8772f Merge pull request #18794 from KorPhaeron/durkel 
Adds missing return to boss loot
 2016-06-21 23:13:49 -05:00
Cheridan
dbf467136f Merge pull request #18830 from MMMiracles/a_skele-ton 
Fixes Invisible Skeletons
 2016-06-21 23:10:56 -05:00
oranges
4bc99d1b2e Merge pull request #18798 from Niknakflak/AngelAI 
Adds the Angel AI Core sprite to the game
 2016-06-22 15:50:37 +12:00
MMMiracles
d3e183a4d4 do the skeleton 2016-06-21 22:55:11 -04:00
oranges
b85862f070 Merge pull request #18785 from Incoming5643/patch-12 
Fixes Infinitely Generating Exotic Blood
 2016-06-22 12:32:23 +12:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction 
Tactical Espionage Action
 2016-06-22 12:08:05 +12:00
oranges
6b1ba6adec Merge pull request #18767 from ChangelingRain/legiondoor 
Fixes legion door alert
 2016-06-22 09:51:06 +12:00
Jack Edge
120810316e Merge branch 'master' into cellular-emporium 2016-06-21 22:32:01 +01:00
oranges
12b8b1a9b2 Merge pull request #18735 from coiax/emergency-drone 
Adds Drone Shells to Emergency cargo packs
 2016-06-22 09:04:13 +12:00
Joan Lung
44875e7fd4 Fixes holoparasites spamming messages while taking negative damage (#18774) 2016-06-21 10:57:07 -05:00
Cheridan
8003b631ac Merge pull request #18761 from ChangelingRain/alloygain 
Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly
 2016-06-21 10:09:43 -05:00
Joan Lung
8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet 
Station rename logging, admin reject button
 2016-06-21 08:46:17 -04:00
Jack Edge
3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +01:00
oranges
269ccc3cf0 Merge pull request #18743 from ChangelingRain/fcrnxvagurgbathrbsgurtbqf 
Non-servant humans can't understand clockwork mobs
 2016-06-21 20:35:24 +12:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3 
Remove spawn III
 2016-06-21 20:11:08 +12:00
PKPenguin321
01d4d02b70 conflicts + undo loc changes 
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
 2016-06-20 22:22:50 -07:00
NikNakFlak
1f1d87c2e3 Angel AI 2016-06-20 22:19:11 -07:00
Cheridan
0287abf2dc Borgs now get less confused over time! 2016-06-20 23:55:13 -05:00
KorPhaeron
d35a31d4ac Blood Contract 2016-06-20 20:14:35 -05:00
Remie Richards
13429cf1d4 user -> src 2016-06-21 01:27:13 +01:00
Remie Richards
c2218f9dd7 break -> continue 2016-06-21 01:22:13 +01:00
Remie Richards
3eed211d91 Venus human trap changes 
* Venus human traps now obey the laws of physics when it comes to finding targets
* Venus human traps will continue to grab hold of you even if you're through a wall SO LONG AS YOU WERE ORIGINALLY A VALID TARGET (headcannon: it can still feel you and grasp hold of you with it's vine)
 2016-06-21 01:18:53 +01:00
Joan Lung
41eee01d09 \n 2016-06-20 20:15:29 -04:00
Cheridan
4dd56dfbb7 Merge pull request #18738 from pudl/ka-desc 
Improves the KA description
 2016-06-20 17:12:42 -05:00
oranges
46bbb4b615 Merge pull request #18728 from coiax/spawn-removal-2 
Removes spawn() from some more slime reactions
 2016-06-21 09:57:07 +12:00
oranges
6ddd748fb2 Merge pull request #18726 from coiax/spawn-removal-1 
Removes spawn() from things I
 2016-06-21 09:56:38 +12:00
Incoming5643
f8547b852d Fixes Infinitely Generating Slime Jelly 2016-06-20 17:01:06 -04:00
Joan Lung
f3043b3386 Cogscarabs have the proper dead icon (#18759) 
* Cogscarabs have the proper dead icon

* replace deconflict
 2016-06-20 15:55:36 -05:00
Xhuis
3e890997f9 Welding fuel hotfix (#18773) 2016-06-20 14:05:11 -05:00
Joan Lung
e3c8345a51 Fixes legion door alert 2016-06-20 12:46:44 -04:00
Cheridan
e4b73d3aae Merge pull request #18739 from ChangelingRain/camocost 
Nuke ops can no longer get free noslips with their camo kit
 2016-06-20 11:37:51 -05:00
Joan Lung
971df0d8de info 2016-06-20 10:36:01 -04:00
Jack Edge
2a31ce80ab Debugging statement commented out 2016-06-20 13:57:39 +01:00
Jack Edge
004dfdc3fe Maybe fixed null z and lavaland entry 2016-06-20 13:42:59 +01:00
Jack Edge
5da579b7c4 Merge branch 'master' into random-space 
Conflicts:
	_maps/asteroidstation.dm
 2016-06-20 13:06:08 +01:00
pudl
f459865be7 Improvements 2016-06-20 05:51:40 -05:00