cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,374 Commits 61 Branches 14 Tags
d110b5fc59b141c19f63120221a07c286328890f
Commit Graph

13321 Commits

Author SHA1 Message Date
Razharas
d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed 
Actually fixes supermatter explosion to not be capped
 2016-01-27 04:16:20 +03:00
Razharas
e67012ef41 Merge pull request #14773 from ChangelingRain/punchy 
Nerfs golem punch stun chances
 2016-01-27 04:09:14 +03:00
Razharas
d240bb49ef Merge pull request #14900 from KorPhaeron/mosin 
Adds dirt cheap surplus rifles to the nuke op uplink
 2016-01-27 04:05:11 +03:00
Razharas
3325776591 Merge pull request #14902 from neersighted/fun_removal 
Resolve wire issues and remove difficult colors
 2016-01-27 04:02:52 +03:00
PKPenguin321
8672ac3bca Merge branch 'master' of https://github.com/tgstation/-tg-station into autoimplanter 
# Conflicts:
#	icons/obj/device.dmi
 2016-01-26 16:06:39 -08:00
Bjorn Neergaard
194ab5b264 Remove unused mapping verb 2016-01-26 15:11:41 -06:00
Bjorn Neergaard
d0f57701d9 Remove old define 2016-01-26 14:07:17 -06:00
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509 
Byond509
 2016-01-26 01:57:42 -06:00
duncathan salt
8fd2393dd7 Merge pull request #14890 from KorPhaeron/capture_the_flag_revival 
Adds capture the flag to Z2
 2016-01-26 00:34:17 -06:00
KorPhaeron
92f2c149cd Adds blue beacon sprite 2016-01-26 00:13:41 -06:00
Razharas
01831fc8eb Merge pull request #14862 from KazeEspada/LizardHunting 
Lizard hunting
 2016-01-26 08:01:11 +03:00
duncathan salt
68888362a2 Merge pull request #14867 from KorPhaeron/remove_grab 
Ninja teleport kidnap works based on pulling people instead of based on grabs
 2016-01-25 20:14:40 -06:00
duncathan salt
f9f6fa2f4d Merge pull request #14802 from Incoming5643/heremembers 
Local Bird Transcends Round Based Universe
 2016-01-25 19:32:04 -06:00
duncathan salt
ee1a17044d Merge pull request #14868 from KorPhaeron/remove_grab2 
Removes Grab from photocopier
 2016-01-25 19:26:47 -06:00
duncathan salt
00aab08714 Merge pull request #14869 from KorPhaeron/remove_grab3.0 
Removes grab from disposal units
 2016-01-25 19:25:54 -06:00
tkdrg
6a3745c46d Merge pull request #14852 from ChangelingRain/blobbernotagain 
Nerfs blobbernaut creation, tweaks blob reagents
 2016-01-25 22:00:48 -03:00
PKPenguin321
65b8ebc3fd added sprite and another fluff sound 2016-01-25 16:58:47 -08:00
KorPhaeron
8e1186ffd9 YOU GET A RIFLE YOU GET AMMO IF THE MAN IN FRONT OF YOU DIES etc 2016-01-25 17:12:21 -06:00
Remie Richards
87f60ad691 Merge pull request #14843 from neersighted/tgui 
mo' tguis: electric boogaloo
 2016-01-25 22:22:29 +00:00
tkdrg
21ddc03148 Merge pull request #14850 from ChangelingRain/forceholo 
Guardians use forcemove where possible
 2016-01-25 18:49:55 -03:00
Bjorn Neergaard
e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
Bjorn Neergaard
961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard
87642fa588 tgui tank dispensers 2016-01-25 12:03:06 -06:00
Bjorn Neergaard
36005a6461 AIs are not physical beings 2016-01-25 12:03:05 -06:00
Bjorn Neergaard
c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Bjorn Neergaard
014e83fec6 Fix tgui machine interactions status checks 2016-01-25 12:03:02 -06:00
Bjorn Neergaard
2f46b224ae Fix air alarm hacking, raise SStimer display 2016-01-25 12:03:00 -06:00
Bjorn Neergaard
dbc64b7d28 tgui fire alarms 2016-01-25 12:02:59 -06:00
Bjorn Neergaard
f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
KorPhaeron
ef2321db74 CTF Disabled by default 2016-01-25 00:59:34 -06:00
KorPhaeron
b445eee80d CTF Revival 2016-01-25 00:52:25 -06:00
Bjorn Neergaard
f1c08e607d Exclude speech bubbles from rotation 
Fixes #14664
 2016-01-24 23:40:50 -06:00
Remie Richards
94f1b51893 Renames appearance flag defines. 2016-01-24 23:26:14 -06:00
Remie Richards
f4bb5fcf0e Min compiler version is now 509, Weapon hit indicators and Progress bars no longer colour/rotate/match the alpha of the atoms they are attached to. 2016-01-24 23:22:12 -06:00
duncathan salt
fc7b38d483 Merge pull request #14880 from tkdrg/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Fixes disposal holders not moving
 2016-01-24 22:27:16 -06:00
PKPenguin321
42f1c5c317 adds fluff sounds 
immulshuns
this is a 1 line change commit zone
 2016-01-24 20:07:23 -08:00
KazeEspada
f4dc133be1 Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 20:52:04 -07:00
KazeEspada
004f081cb9 Lizards now hunt from a list. 2016-01-24 20:51:46 -07:00
Nerd Lord
8131d9e5b1 i forgot what to set the var to between looking at the proc and looking back at supermatter 2016-01-24 22:33:16 -05:00
Cheridan
b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys 
Fixes some awful defines to not be hacks
 2016-01-24 21:15:14 -06:00
tkdrg
391d3ee7dd Merge pull request #14830 from KorPhaeron/welding_tank 
Fixes KAs not detonating welding tanks
 2016-01-25 00:13:07 -03:00
Nerd Lord
3d9c7eb1a9 synch mesh does more when surrounding, ripping tendrils does less stamina, more brute 2016-01-24 21:58:46 -05:00
Tkdrg
cea08f4a81 Fixes disposal holders not moving 
Fixes #14866
 2016-01-24 23:36:14 -03:00
PKPenguin321
dbe098da12 smooshes the two messages into one line 
one line change commit boys
 2016-01-24 18:35:32 -08:00
PKPenguin321
1f7353e3ed polishes the code 
thanks @neersighted
 2016-01-24 18:22:37 -08:00
PKPenguin321
5c39c5daf3 adds autoimplanter 
automatically implants the user with an inserted cyberimplant by using it in your hand. comes in nuke ops box of implants bundle
 2016-01-24 18:02:43 -08:00
KorPhaeron
621c59ad3d Remove grab 2016-01-24 19:14:40 -06:00
KorPhaeron
b80f5c095f Removes Grab from photocopier 2016-01-24 19:11:09 -06:00
KorPhaeron
056a621b05 Ninja 2016-01-24 19:09:11 -06:00
Iamgoofball
b92e2109b5 N E V E R 2016-01-24 14:39:08 -08:00