cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,603 Commits 61 Branches 14 Tags
bee40cf9cd7ab99ecfc28ba30b1baf22c4a23362
Commit Graph

12970 Commits

Author SHA1 Message Date
duncathan salt
bee40cf9cd Merge pull request #14388 from ChangelingRain/notsosimpleisit 
Fixes simple animal damage type handling
 2016-01-05 22:23:23 -06:00
duncathan salt
50ebfa0f17 Merge pull request #14395 from MrStonedOne/nomoreminus1 
Removes a bunch of sleep(-1) and spawn(-1) from the code
 2016-01-05 22:16:17 -06:00
Nerd Lord
240263c5d5 Clamp it! 2016-01-05 22:51:18 -05:00
Jordie
1c48e9fc0f Merge pull request #14409 from neersighted/more_tgui_fixes 
Fix some typos, don't wash out button hover colors, fix APC delays
 2016-01-06 14:24:36 +11:00
tkdrg
2c15df59c5 Merge pull request #14400 from ChangelingRain/standards 
Adds a space after the ghost follow link for messages that lacked it
 2016-01-05 21:26:41 -03:00
tkdrg
ece39f0fb4 Merge pull request #14157 from TrustyGun/iseethecolors 
Adds two new UI styles: Slimecore and Operative
 2016-01-05 20:10:10 -03:00
TrustyGun
3f31949bb5 Merge branch 'test' into iseethecolors 2016-01-05 03:41:27 -05:00
Aranclanos
4cfab7f991 Merge pull request #14367 from Gartley/Grammar-fix-14297 
Small grammar fix to shielded message.
 2016-01-05 05:02:25 -03:00
Aranclanos
6a667d080e Merge pull request #14349 from AnturK/awayareas 
Adds away areas to ghost teleport/ admin jump list
 2016-01-05 04:54:39 -03:00
Cheridan
4e81912656 Merge pull request #14356 from phil235/AlienEvolveFix 
Fixes some bug about alien evolving
 2016-01-04 23:15:27 -06:00
duncathan salt
3dfa1b4e55 Merge pull request #14368 from PKPenguin321/patch-8 
experimentor typo fix
 2016-01-05 05:51:13 +01:00
Bjorn Neergaard
872bf0a692 Fix some typos, don't wash out button hover colors, fix APC delays 2016-01-04 22:01:14 -06:00
duncathan salt
f9f12f6447 Merge pull request #14261 from KorPhaeron/SMES 
SMES logging fix
 2016-01-05 03:13:30 +01:00
KorPhaeron
3d74978881 Uses get_turf 2016-01-04 19:40:01 -06:00
phil235
2ed4643e74 forgot to remove that line. 2016-01-05 01:49:07 +01:00
Nerd Lord
c2a3be931b Adds a space after the ghost follow link for messages that lacked it 2016-01-04 19:26:07 -05:00
duncathan salt
c3aff8dffe Merge pull request #14355 from ChangelingRain/justwatchthem 
Adds follow links to overmind, revenant, and abductor chat
 2016-01-05 01:15:10 +01:00
MrStonedOne
fd80575f38 Removes a bunch of sleep(-1) and spawn(-1) from the code 
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
 2016-01-04 15:17:12 -08:00
Cheridan
797bfe01ef Merge pull request #14391 from neersighted/tgui_followup 
Fix tgui proc signatures and thus AI APC reboot
 2016-01-04 17:06:52 -06:00
Bjorn Neergaard
174c25f53f Initialize non-inlined UIs through a topic call 2016-01-04 16:58:40 -06:00
Bjorn Neergaard
aec6bc103c Fix tgui proc signatures and thus AI APC reboot 
This allows state overloading

Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
 2016-01-04 16:25:20 -06:00
tkdrg
c13a2f97e5 Merge pull request #14342 from neersighted/tgui_followup 
More tgui fixes and tweaks
 2016-01-04 18:39:52 -03:00
Bjorn Neergaard
31281dabf7 Add IE detection 
Now we beg the user to upgrade, or to switch to No Frills mode

Also fix some minor IE bugs
 2016-01-04 15:17:26 -06:00
Nerd Lord
3d32bde4a6 I mean, you shouldn't make any of these immune to damage types but it won't break the healing if you do. 2016-01-04 15:41:08 -05:00
Nerd Lord
4815a0f37c Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types. 
No, no, do it properly not half-ass it
 2016-01-04 15:29:23 -05:00
duncathan salt
421ecbeb9f Merge pull request #14323 from Shadowlight213/Mindattacklog 
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
 2016-01-04 20:31:37 +01:00
duncathan salt
e84668a8d9 Merge pull request #14328 from Shadowlight213/Greenslimesynths 
Reworks Green slime core blacklist to use a species flag.
 2016-01-04 20:30:06 +01:00
duncathan salt
5edf9f87e1 Merge pull request #14329 from KazeEspada/Mobfix1pointO 
Fixes a runtime involving mobs that get deleted upon death.
 2016-01-04 20:28:52 +01:00
duncathan salt
e79f214d58 Merge pull request #14330 from KorPhaeron/leap_icon 
Makes leap_icon a hunter var instead of mob var
 2016-01-04 20:27:47 +01:00
duncathan salt
fe16c5b50f Merge pull request #14333 from KorPhaeron/venus_human_trap 
Fixes venus human traps killing eachother
 2016-01-04 20:26:10 +01:00
duncathan salt
e0cb0e258e Merge pull request #14334 from KorPhaeron/statue_buffs 
Fixes drones freezing living statues
 2016-01-04 20:25:35 +01:00
duncathan salt
c510fb69c2 Merge pull request #14337 from AnturK/miningbot 
Fixes mining bot being hard to repair.
 2016-01-04 20:23:23 +01:00
Bjorn Neergaard
57cd223eb0 Fix contains proc to use a loop 2016-01-04 12:17:09 -06:00
Bjorn Neergaard
dc69cbaefb Allow UIs to be attached to datums; various fixes 2016-01-04 10:46:31 -06:00
Jordie
ddc4b16c64 Merge pull request #14322 from MrStonedOne/spawnremovals 
removes a bunch of unneeded timer less spawns
 2016-01-04 18:21:36 +11:00
Bjorn Neergaard
453f149be5 Fix tgui states 
This led to a few in-game exploits it seems
 2016-01-04 00:02:28 -06:00
Bjorn Neergaard
1b5438851a Treat assets as binary; fix sizes once and for all 2016-01-03 23:09:14 -06:00
PKPenguin321
beaa3efd18 experimentor typo fix 
fixes a small typo
 2016-01-03 21:07:53 -08:00
Michael Gartley
3cf26018de Small grammar fix to shielded message. 
Fixes #14297

Added span class and reworded message while trying to keep the flavour
of text.

NB: This time I hopefully wont be such a pleb when trying to help.
 2016-01-04 04:14:20 +00:00
Bjorn Neergaard
1955b8c2df Fix a couple typos with the Air Alarm UI 2016-01-03 21:45:57 -06:00
Bjorn Neergaard
1319bd722d Clean comments; adata on the serverside; update postcss; APC size 2016-01-03 19:18:55 -06:00
Bjorn Neergaard
9c1e05f57e Increase tgui security by inlining for admins only; reduce cruft 2016-01-03 18:59:01 -06:00
tkdrg
e0a16b4467 Merge pull request #14304 from MMMiracles/snowbuck 
Snowdin Edits
 2016-01-03 21:11:13 -03:00
tkdrg
e3caa991b0 Merge pull request #14311 from MrStonedOne/patch-115 
Makes sdql2 DELETE use qdel and not del
 2016-01-03 21:04:45 -03:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
phil235
0b98fffeef - Adds a visible message when the larva grows into a humanoid. 
- Removes some duplicated code in alien growth code (larva-to-humanoid, praetorian and queen now all use the same proc).
- Alien drones can no longer evolve into a praetorian while inside a pipe (praetorian can't ventcrawl) or other containers.
- Removed an unneeded check in larva_evolve/fire().
- Fixes bug where a larva could evolve despite being incapacitated/dead during the selection of the alien caste.
- Remove outdated code in monkey/attack_hand about disarm and grab intent.
- Evolving into a royal alien no longer delets what you hold in your hands and the content of your stomach.
 2016-01-03 23:19:30 +01:00
Nerd Lord
6450f937b2 abduct this 2016-01-03 16:56:34 -05:00
Bjorn Neergaard
34019aefd2 Clean up chem dispenser UI 2016-01-03 15:19:05 -06:00
tkdrg
8612333265 Merge pull request #14133 from KorPhaeron/follow 
Adds follow links to all forms of chat
 2016-01-03 16:31:11 -03:00
AnturK
4a3324b673 Adds away areas to ghost teleport/ admin jump list 2016-01-03 20:25:48 +01:00