cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,615 Commits 61 Branches 14 Tags
a8e4e185ae8ac45a000804d5f3687c19f31eefca
Commit Graph

6066 Commits

Author SHA1 Message Date
Incoming
a8e4e185ae Adds a traitor item ToyAI that can upload the last ion law it generated via an upload console. Note that this is NOT a normal ToyAI that has been emagged, but rather an upload board mimicing a ToyAI (with a tell in the description). 
This ToyAI has been added to the AI subversion bundle, note that since a traitor with this bundle already gets a hacked AI module there's no added benifit to it being there, its just for whimsical traitors who'd enjoy adding a little spice to the AI or false flag the changes as a badmin ioning an AI.
 2013-09-19 01:15:39 -04:00
Incoming
a11b75f31e Procs out Ion law generation 2013-09-18 20:42:10 -04:00
Incoming
4638e0d0c4 Adds a toy AI to the arcade machine prize list. When you press it it'll annouce a random Ion Law to everyone around. This has a cooldown to prevent spammage and to make sure that the switch hell that is AI ion law code isn't taxing things too much (it looks a lot worse than it actually runs). 
This replaces the blink toy in arcade machines, because they were a terrible booby prizes that no one in their right mind would mistake for something threatening because who in their right mind would leave a syndicate summoning beacon lying around instead of the thing that it summons.
 2013-09-18 19:59:48 -04:00
MrPerson
8f7649346e Merge pull request #1346 from d3athrow/identbans 
Fixes identity bans, no longer will it cause everybody to have a random ...
 2013-09-12 15:39:08 -07:00
MrPerson
a2ac02c650 Merge pull request #1349 from caelaislinn/terbs_weekly_fun 
missing icecream fixes
 2013-09-12 15:37:14 -07:00
Aranclanos
95bfb86226 Merge pull request #1280 from Ergovisavi/improvexplosive 
Adds createable Improvised Explosives!
 2013-09-12 02:30:04 -07:00
Cael Aislinn
780b32a1aa Merge pull request #1325 from Neerti/9-7-2013_costume_vender 
Adds a costume vender to the code
 2013-09-11 18:54:36 -07:00
Cael_Aislinn
5ea4807d50 Merge branch 'torban' of https://github.com/Carn/-tg-station 
Conflicts:
	code/modules/admin/IsBanned.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-12 11:49:40 +10:00
Ergovisavi
fdb72fa3e7 Moves the fuel remaining in the fuel tank check around 2013-09-11 18:33:56 -07:00
Cael_Aislinn
90631744c6 missing icecream fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-12 10:28:03 +10:00
Cheridan
42a2cd1bc8 Merge pull request #1331 from caelaislinn/terbs_weekly_fun 
Terbs weekly fun #4: Ice cream vats
 2013-09-10 23:35:15 -07:00
Cheridan
67c6b8ebaf Merge pull request #1329 from KazeEspada/Honkinlizards 
Fixes Honks(finally).
 2013-09-10 23:01:36 -07:00
d3athrow
33b90b805f Fixes identity bans, no longer will it cause everybody to have a random name and appearance 2013-09-11 00:58:49 -05:00
d3athrow
31bfe2f146 Some reason it pushed the old one...? 2013-09-10 16:24:57 -05:00
d3athrow
f717f00797 Fixes href exploit in borgs, now improved because the last one was kinda silly 2013-09-10 16:23:33 -05:00
Cael_Aislinn
2d120ea1e2 adds the icecream dispenser, adds icecream dispenser to kitchen, adds pda painter to hop office 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-10 13:15:41 +10:00
Aranclanos
e8965145a8 Merge pull request #1324 from fleure/resin 
Minor atmos fixes for resin and mineral structures
 2013-09-09 12:31:19 -07:00
Ergovisavi
a224d36dd3 Ups the required fuel for improvised explosives to 50 units. 2013-09-09 01:50:01 -07:00
Ergovisavi
c2fe5edbd9 Adds a text message when a welding fuel tank has less than 30 fuel and you try to fill an iedcasing with it 
No more -amount, cable coil is properly used up.
 2013-09-08 23:20:15 -07:00
KazeEspada
8f952283c2 reverts my changes to supply packs. Will address in a later larger pull request. 2013-09-08 20:03:41 -07:00
Cael_Aislinn
9974149b55 adds human, cyborg and alien speech bubbles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-09 11:20:32 +10:00
KazeEspada
6f89258007 Fixes two ancient bugs. 
Fixes HONKs having a unique equipment selection menu that caused bugs. Replaced by the one that all mechs use. Fixes bug #103.

Makes a var on supply packs that determines whether they get deleted or garbage collected. If the supply pack contains an object that references others it must be deleted. Mulebot #3 can finally rest in peace. Fixes bug #137
 2013-09-08 18:04:43 -07:00
Aranclanos
c2c0d320ab Merge pull request #1310 from KazeEspada/sounds 
Stop sounds
 2013-09-08 05:11:34 -07:00
Aranclanos
d1392e4da6 Merge pull request #1319 from Cheridan/revert 
Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squa...
 2013-09-08 05:11:21 -07:00
Aranclanos
4190c0b642 Merge pull request #1314 from Cheridan/virus 
Better Pandemic Feedback
 2013-09-08 05:11:09 -07:00
Neerti
c6f822016a Changed the vend_reply to one phrase because it said both and I don't know why. 2013-09-07 21:55:12 -04:00
Neerti
b696fc5aad Added a new vending machine which vends mostly everything that randomly spawned in the theater and a few extras. 
Also recolored an unused vending machine to use for this machine.
 2013-09-07 20:23:03 -04:00
Fleure
73d25c7c04 Minor atmos fixes for resin and mineral structures 2013-09-08 01:01:12 +01:00
Aranclanos
e610c6538d Merge pull request #1307 from TZK13/09-05-13/Mime-Burger-Recipe 
Changes the mime burger recipe
 2013-09-07 10:57:30 -07:00
Aranclanos
09430081d7 Merge pull request #1312 from RobRichards1997/06/09/2013-Lizard-Icon-Fix 
Fixes the invisible dead lizards #1309
 2013-09-07 10:36:45 -07:00
Cheridan
7d117587ad Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squash" 
This reverts commit 6206285633, reversing
changes made to 83a6ebfc95.
 2013-09-06 22:00:11 -05:00
Ricotez
6206285633 Merge pull request #689 from dumpdavidson/changeling_voices_squash 
Changeling personal hivemind
 2013-09-06 15:36:41 -07:00
Cheridan
83a6ebfc95 Merge pull request #1300 from Zelacks/hrefspoofemag 
Emagging cyborgs href spoof fix
 2013-09-06 09:08:50 -07:00
Cheridan
6fb9c6c786 Merge pull request #1298 from Zelacks/silencefix 
Energy Crossbows now play the correct sound
 2013-09-06 09:04:26 -07:00
Cheridan
990f2c58f3 Pandemic Replicator Indicatior Light 2013-09-06 10:38:06 -05:00
Ricotez
823d5400db Merge pull request #1303 from ACCount12/master 
transformation diseases fix, Fixes #1103
 2013-09-06 06:43:41 -07:00
Robson Richards
47e1875899 Fixes the invisible dead lizards 2013-09-06 08:09:37 +01:00
Cheridan
7d69a669ba Merge pull request #1302 from RobRichards1997/05/09/2013-Sigh-Emote-Fix 
Re-Adds the Sigh emote, Fixes #1301
 2013-09-05 19:41:01 -07:00
KazeEspada
53424fc84f Adds a new admin verb in the debug category called Silence Sounds. It can be used to stop all sounds currently playing. Useful if you need to diagnose if the sounds are the cause of lag, or if you play two sounds on top of each other. 2013-09-05 19:40:40 -07:00
Cheridan
ac8cd01c17 Merge pull request #1284 from caelaislinn/terbs_weekly_fun 
Terbs weekly fun #3 detective can reskin his gun
 2013-09-05 15:46:11 -07:00
Cael_Aislinn
fa84ee1a0e detective can reskin his gun 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-06 08:43:00 +10:00
TZK13
20d93ee7f9 Changes the ingredient item in the mime burger recipe from a beret to a mime mask. 2013-09-05 16:20:16 -05:00
ACCount12
9c5b82efbf Update xeno_transformation.dm 
xenomicrobes fixed
 2013-09-04 20:21:09 -07:00
ACCount12
3b46cfd140 Update robotic_transformation.dm 
roburgers fixed
 2013-09-04 20:21:04 -07:00
Robson Richards
18a76d0387 Re-Adds the Sigh emote 2013-09-05 02:01:36 +01:00
MrPerson
bd27a8a023 Merge pull request #1292 from Cheridan/master 
Removes an unused var from every obj
 2013-09-04 12:54:40 -07:00
Zelacks
e463a9d5e6 Further Sanity 
Ensures the AI will only recruit valid targets for emagging
 2013-09-05 03:41:24 +08:00
Zelacks
13dad6338c Emagging cyborgs href spoof fix 
Stops human, non special AI from emagging cyborgs using a spoofed href
 2013-09-05 03:28:47 +08:00
Cheridan
a830ba2740 Merge pull request #1282 from MrPerson/grammer 
Grammar fixes
 2013-09-04 10:01:31 -07:00
Cheridan
a05ffb5208 Merge pull request #1272 from fleure/brigdoor 
Fixed brig doors counting down when timer is stopped
 2013-09-04 09:30:17 -07:00