cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,435 Commits 61 Branches 14 Tags
a4f4d42a2f4d7b7c9cfa09fa2afbf5d87b04f1b2
Commit Graph

5310 Commits

Author SHA1 Message Date
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
CollenN
95d9829e62 Fixes #4002 
Where is your god now
 2014-06-23 21:53:14 -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
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
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
phil235
920975dd68 notice -> warning 2014-06-13 22:55:51 +02:00
Menshin
71c71367fe Fixes energy weapons drawing charges on click even when no shot was fired (fixes #3910). 2014-06-13 22:17:30 +02:00
Giacomand
bc945b6c92 Fixes the gravity generator not updating your gravity status, so you stop floating. 2014-06-13 20:17:11 +01:00
MrPerson
44638fd05c Add logging to failed GC's that result in a del() call 
You can view these logs in-game using a debug verb. You have to use the debug-verbs command to see it.

Removed the dellogging compile option. If this is a problem, speak up, but for most users, this new functionality is more useful.
 2014-06-13 11:46:17 -07:00
phil235
04d3717193 attack message Human 2014-06-13 20:12:16 +02:00
phil235
10ef6bf1b1 attack message alien humanoid 2014-06-13 20:08:27 +02:00
phil235
d825ae0f92 attack message alien larva 2014-06-13 20:07:28 +02:00
phil235
19a9bab445 attack message slime 2014-06-13 20:06:03 +02:00
phil235
6817e93aeb attack message monkey 2014-06-13 20:05:05 +02:00
phil235
1152a5b099 attack message simple animals 2014-06-13 20:03:59 +02:00
ikarrus
df285ff7b3 Resolved conflicts: 
code/modules/mob/mob.dm
 2014-06-13 09:04:30 -06:00
Cheridan
8796e6e914 Update singularity.dm 
smoke effect when ghosts arise as harvesters
 2014-06-13 08:48:14 -05:00
Alex
2cb371c4df Merge pull request #3906 from Malkevin/sparklesparkle 
Igniter sparks
 2014-06-13 09:16:30 +01:00
Alex
79a08d5efd Merge pull request #3898 from Ikarrus/striptextfix 
Stripping people now bolds the text for the target
 2014-06-13 09:14:01 +01:00
Cheridan
4b41d340bd Merge pull request #3903 from phil235/HardHatUpdateFix 
Fixes hard hat sprites not updating
 2014-06-12 19:29:14 -05:00
Hornygranny
0b4387f031 removes gravity failure event placeholder 2014-06-12 14:52:53 -07:00
Alex
13f53bdb81 Merge pull request #3842 from Cheridan/stopbeatingpeople 
'Released' Sechud Icon Edit
 2014-06-12 10:41:28 +01:00