cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,468 Commits 61 Branches 14 Tags
e65919da427e1bbcf552a98fba97ac924b2a07aa
Commit Graph

5327 Commits

Author SHA1 Message Date
Menshin
e65919da42 Removed the now unused directwired variable 2014-07-02 23:58:12 +02:00
Menshin
b158820043 Fix merging powernet on turf sometimes not connecting machines. 2014-07-02 19:01:11 +02:00
Menshin
c6c8c58ef7 Machines de/connecting from/to a powernet will now always call the connect_to_network/disconnect_from_network procs instead of de/connecting directly. 2014-07-01 18:54:41 +02:00
Aranclanos
c65aa2b5a4 Merge pull request #4000 from Cheridan/terribleidea 
MONKEY MODE REDUX
 2014-06-30 16:27:22 -03:00
Cheridan
134272b744 Merge pull request #3949 from Rolan7/MidJuneBugfixes 
Changeling/say code bugfixes
 2014-06-30 11:19:59 -05:00
Ben G.
e5bc43d12e Merge pull request #4008 from advomach/master 
List lookup to actual math
 2014-06-27 19:43:55 -05:00
Alex
0f6e61968a Merge pull request #4006 from optimumtact/patch-4 
Override emp_act on the ionrifle
 2014-06-27 14:02:17 +01:00
Alex
453589785d Merge pull request #3985 from CollenN/blackfix 
Fixes Black Lizardmen
 2014-06-27 13:58:26 +01:00
Alex
a4f4d42a2f Merge pull request #4013 from Menshin/make_powernets_fix 
Fixes make_powernets proc
 2014-06-27 09:26:10 +01:00
Alex
a04d5ffc9e Merge pull request #3953 from Ikarrus/alienERPfix 
Humanoid aliens can now strip again.
 2014-06-26 09:26:37 +01:00
Menshin
788a97471f Fixes _make_pownernets_ proc not adding the first cable found to its cable list. 
Fixes #4011.
 2014-06-25 15:49:50 +02:00
advomach
79447673a0 Update singularity.dm 
Removed comment
 2014-06-24 19:00:41 -04:00
advomach
48098c3249 Replaced var/sizes_to_number with weirdass formula that is faster and takes up less space in code than list lookups 2014-06-24 11:37:03 -04:00
Francis Devine
2786bcc54b Override emp_act on the ionrifle 
A gun isn't much use if it disables itself

fixes #3994
 2014-06-24 20:37:27 +12:00
CollenN
95d9829e62 Fixes #4002 
Where is your god now
 2014-06-23 21:53:14 -04:00
CollenN
3a0e81f7f3 OKAY WHOOPS I LIED 
THIS corrects pre-existing black mutantcolors.
 2014-06-22 20:31:21 -04:00
CollenN
5e70ab0f98 Fixes accidental parenthesis 
I accidentally put that one in after I'd already compiled, and didn't
catch it until after I published.
 2014-06-22 20:20:49 -04:00
CollenN
6571767caa Fixes black lizardmen 
Everyone whose mutant color is set to black is now instead white.

Also, now black mutantcolors are automatically set to the default color
of your species if you select them.
 2014-06-22 20:19:02 -04:00
Rolan7
7decfe8621 Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-06-21 09:00:21 -04:00
Cheridan
5cfa0df3d2 Merge pull request #3790 from Miauw62/bestiality 
Fixed #3077. Singularity now sucks small items instead of large ones.
 2014-06-21 01:13:13 -05:00
Cheridan
02603f89e4 Merge pull request #3934 from Ikarrus/jobequip 
The Select-Equipment admin verb now includes all jobs
 2014-06-21 00:47:30 -05:00
Cheridan
4ca1c68bd9 Merge pull request #3958 from hornygranny/metaconfirmation 
more obvious metaconfirmation from digital camo
 2014-06-21 00:41:49 -05:00
Cheridan
f786a6c2c0 Merge pull request #3959 from CollenN/mutrace-final 
Finalizes Mutantrace Datum Update
 2014-06-20 21:47:54 -05:00
CollenN
56eb50938b Added some of Cheridan's suggestions 
*Removed 'Make 2spooky' admin command
*You can still gib even if you don't have DNA
*species_types now uses absolute pathing (probably not gonna do the same
for species.dm, mainly because with such a large file it strikes me as
practical to keep the paths relative)
 2014-06-20 21:35:48 -04:00
CollenN
0a173f10dd Aaaaaaaaaaaaaaarghhhhh 
IN MY DEFENSE, you can't actually be set on fire in the first place if
you have HEATRES or NOFIRE in your specflags, so it was easy for me to
overlook this one.

This is really more of an issue with BYOND than anything else.
 2014-06-20 17:19:00 -04:00
Cheridan
06edd41bab Merge pull request #3889 from Kelenius/OfCyborgsAndModules 
Of cyborgs and modules
 2014-06-20 15:03:15 -05:00
Hornygranny
713ce934b4 t 2014-06-20 09:22:27 -07:00
Cheridan
375997f245 Merge pull request #3919 from MrPerson/qdel_logging_verb 
Add logging to failed GC's that result in a del() call
 2014-06-20 10:33:22 -05:00
CollenN
9d1659219e Encapsulates if() statement 
Profakos pointed this out
 2014-06-20 06:52:58 -04:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update 
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
 2014-06-19 17:42:14 -04:00
Hornygranny
913b3061a0 more obvious metaconfirmation from digital camo 2014-06-19 13:44:24 -07:00
Miauw
75a0eadb37 Removes an unneeded unEquip(). 2014-06-19 19:00:10 +02:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp 
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
 2014-06-19 02:27:10 +04:00
Ikarrus
ff1767a6a8 Update simple_animal.dm 2014-06-18 08:33:33 -06:00
Ikarrus
38434271fc Update metroid.dm 2014-06-18 08:33:17 -06:00
Ikarrus
72eb5592cb Update larva.dm 2014-06-18 08:32:49 -06:00
ikarrus
aabd426794 Humanoid aliens can now strip again. 
Other restrictions are still in place.

Fixes #3952
 2014-06-17 20:26:52 -06:00
Rolan7
98367cb162 Changelings can use hivechat while muzzled. 
Monkey-lings can use hivechat.
Lings can return to human form even if monkeyed through genetics.
One-line fix for Destroying Angels (..() wasn't being called)
Spelling correction in Destroying Angel description
 2014-06-17 00:13:56 -04:00
Alex
7b7f8bf583 Merge pull request #3916 from hornygranny/rip_wip 
removes gravity failure event placeholder
 2014-06-16 10:40:40 +01:00
Alex
4a1a90d3fd Merge pull request #3923 from phil235/EatMessageFix 
Fixes #3917
 2014-06-16 10:39:12 +01:00
Alex
943f861532 Merge pull request #3918 from phil235/MobAttackFix3 
Fix for various mob attack message (take two)
 2014-06-16 10:38:57 +01:00
Alex
4b9ab2a8be Merge pull request #3921 from Menshin/eguns_fix 
Fixes energy weapons drawing charges on click even when no shot was fire.
 2014-06-16 10:38:30 +01:00
Alex
02d4a5a0d2 Merge pull request #3904 from Cheridan/sillynarnar 
Nar-Sie update
 2014-06-16 10:37:35 +01:00
Cheridan
897fa42ffb Merge pull request #3932 from Ikarrus/removecuff 
Resisting out of handcuffs should now update your icon properly
 2014-06-15 10:53:31 -05:00
ikarrus
726b1dc28f The Select-Equipment admin verb now includes all jobs 
Useful for admins and coders alike.
 2014-06-14 22:05:15 -06:00
Cheridan
eeec802382 Merge pull request #3920 from Giacom/grav_fix 
Fixes the gravity generator not updating your gravity status, so you sto...
 2014-06-14 21:34:57 -05:00
Cheridan
352d5a5627 MONKEY MODE REDUX 
AHUAHEUAHUHEGUEHGAUHEGUAEH

monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
 2014-06-14 21:30:25 -05:00
ikarrus
46a60140c3 Resisting out of handcuffs should not update your icon properly 
The icon was being updated before the cuffs were removed
 2014-06-14 19:34:18 -06:00
Menshin
f691c84983 Span class. 2014-06-14 22:29:37 +02:00
Cheridan
514ed5f0af Merge pull request #3805 from Menshin/hud_and_pulling 
Non-human HUD polishing (stop pulling and intent buttons)
 2014-06-13 17:58:49 -05:00