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

3196 Commits

Author SHA1 Message Date
Incoming
a11b75f31e Procs out Ion law generation 2013-09-18 20:42:10 -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
Aranclanos
95bfb86226 Merge pull request #1280 from Ergovisavi/improvexplosive 
Adds createable Improvised Explosives!
 2013-09-12 02:30:04 -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
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
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
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
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
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
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
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
ec501b1b32 Fixed variable names 
Fixed variable names so they use proper naming convention
 2013-09-04 22:57:08 +08:00
Zelacks
a8b0824b7a Energy Crossbows now play the correct sound 
Changed it so that silenced weapons still play the fire_sound that they
are given
 2013-09-04 22:39:56 +08:00
Cael Aislinn
f6206dc6ac Merge pull request #1187 from Tenebrosity/gunshot 
Replaces the default gunshot sound effect with four higher quality ones
 2013-09-04 02:12:10 -07:00
Cheridan
899a53787a Removes an unused var defined for every obj. 2013-09-03 09:38:30 -05:00
VistaPOWA
761731c27a Merge git://github.com/tgstation/-tg-station into critter_crates 
Conflicts:
	icons/obj/storage.dmi
 2013-09-02 13:18:15 +02:00
Aranclanos
9f1803aae4 Merge pull request #1270 from caelaislinn/terbs_weekly_fun 
Terbs weekly fun #2: Laser pointers
 2013-09-01 17:55:49 -07:00
Ergovisavi
9125c53028 Improvements on improvised explosives 
They now have a random hidden detonation time that ranges from 3 to 8 seconds
They now can be made from any can, and will have a different appearance based on each one

-They look goofy if you try to spawn them in with admin commands (they have no soda can to reference, so the can is invisible in the sprite) but are completely functional otherwise

Modifies reagent_containers/food/drinks in order to move all canned drinks to the food/drinks/soda_cans to bunch them all up so they are easily worked into the IED

Modifies machinery/vending due to the abovementioned moving of canned drinks from food/drinks to food/drinks/soda_cans

Modifies the map because of the above to fix filepath issues

And of course adds weapons/grenades/ghettobomb.dm for the bulk of the IED, and modifies grenade.dmi for the sprites
 2013-09-01 09:18:28 -07:00
Cael_Aislinn
286ff34588 moved human helpers out of human.dm to new file human_helpers.dm, added two new mon helpers to check for mutations and mutantraces 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-01 13:37:07 +10:00
JJRcop
75d2d35982 Correcting overlooks due to merge from master 
When I merged master into pull 1245 to resolve conflicts, I didn't notice that
the merge did some unintended things, like duplicating conditionals.

These have been corrected, and I also made more things call ..(act) so that
there is less duplicate code in different emote procs.
 2013-08-31 14:10:33 -04:00
Cheridan
b84572dff5 Merge pull request #1266 from Incoming5643/alienfix 
Aliens can now pick up facehuggers again. Fixes Issue #1044
 2013-08-31 08:55:24 -07:00
Cheridan
214160aac8 Merge pull request #1255 from Intigracy/WhatAGag 
What a gag!
 2013-08-31 08:43:40 -07:00
Cheridan
458c091ffb Merge pull request #1257 from RobRichards1997/29/08/2013-Stechkin-Pistol-Buff 
Buffs to the Stechkin Pistol
 2013-08-31 08:36:51 -07:00
Cheridan
e153a426e3 Merge pull request #1264 from caelaislinn/terbs_weekly_fun 
Terbs Week of Fun: Day 1: Ghost Chilis
 2013-08-30 18:06:20 -07:00
Cael_Aislinn
ddf5403373 adds ghost chilis, makes condensed capsicain actually do something when ingested 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-08-31 09:56:01 +10:00
VistaPOWA
6e83288a78 Bunch of fixes 
Cleans up the resist code for lockers
Adds both locked and broken vars to closets
Fixes secure lockers opening when welded, but not locked
 2013-08-30 19:59:23 +02:00
Incoming
5ccfc1c778 Removes the redundant alien check 2013-08-30 12:31:15 -04:00
Cheridan
f738422ebb Merge pull request #1245 from JJRcop/emotes-rework 
Emote rework, invalid emotes are passed to ..(), slimes and cyborgs exem...
 2013-08-30 09:27:07 -07:00
Incoming
ba7968cb5f Aliens can now pick up facehuggers again. Fixes Issue #1044 2013-08-30 12:20:29 -04:00
Cheridan
a4b17f7ef3 Merge pull request #1246 from Intigracy/adminchangingstuff 
Standardizing permissions for admins
 2013-08-29 21:38:49 -07:00
Cheridan
40d880ab5b Merge pull request #1235 from VistaPOWA/voiceanalyser_fix 
Fixes attached voice analysers not listening
 2013-08-29 13:48:25 -07:00
Robson Richards
e1b1c3c6b0 Commits Buff, Stechkin AGAIN 2013-08-29 20:50:32 +01:00
Intigracy
f7c644c9dc Adds gags! 
50% chance of getting either a gag or a blindfold with the maid and nyangirl outfits in the theater

Monkeys have a sprite too.
 2013-08-29 12:19:34 -07:00
Cheridan
a15032f74a Merge pull request #1236 from KazeEspada/reagents 
Reagent fix (booze, mercury)
 2013-08-29 09:56:18 -07:00
Cheridan
ff2cf8ea61 Merge pull request #1233 from caelaislinn/pugs 
Adds missing pug icon states, adds some misc pug behaviour stuff
 2013-08-29 09:29:24 -07:00
JJRcop
cdb6fdbdb7 Merge branch 'master' of https://github.com/tgstation/-tg-station into emotes-rework 2013-08-29 01:09:39 -04:00