cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 22:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,292 Commits 61 Branches 14 Tags
961eeea661aa24bcb6bdedc04414fa856446f0df
Commit Graph

4234 Commits

Author SHA1 Message Date
Bjorn Neergaard
961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -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
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
duncathan salt
f56eec60fb Merge pull request #14809 from tkdrg/hurr_bugexploitingisfun 
[s]Fixes RPD/disposals exploits
 2016-01-24 13:43:41 -06:00
Tkdrg
773f0f7c21 Fixes RPD/disposals exploits 
Also removes a bit of copy-paste and speeds up a helper slightly.

Fixes #13473
Fixes #14654
 2016-01-24 16:23:20 -03:00
AnturK
9e8eca56a7 Adds AI card tgui 
Removes the multiple AI's on one card semi feature.
 2016-01-24 12:52:31 +01:00
Bjorn Neergaard
2998624bc3 Fix tanks not showing they are connected to a mask 
Fix wire pulse sound
 2016-01-23 18:56:34 -06:00
bear1ake
6972a21830 Fix for #14804 
Thanks to phil235
 2016-01-24 00:22:57 +09:00
MrPerson
e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08:00
Bjorn Neergaard
1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard
4c192d705a Rewrite heaters/freezers; port to tgui 
They are now one type, thermomachine.
 2016-01-22 19:25:35 -06:00
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard
99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites 
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
 2016-01-22 19:22:11 -06:00
Bjorn Neergaard
4ec75a5ecb Add better pizza bomb sprites 2016-01-22 19:22:10 -06:00
Bjorn Neergaard
87b0857b93 Refactor wire datums 
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
 2016-01-22 19:22:09 -06:00
tkdrg
c26a9488d4 Merge pull request #14762 from AnturK/botradiofix 
Fixes Pingsky Radio
 2016-01-22 21:34:17 -03:00
AnturK
b879d40f04 Fixes Pingsky Radio 2016-01-20 16:39:57 +01:00
Bjorn Neergaard
3ae2397d9f Fix interacting with intercoms as AI 2016-01-19 17:02:59 -06:00
Bjorn Neergaard
1c34479376 Fix uplink code once and for all 
Fixes #14733
 2016-01-19 16:42:57 -06:00
Bjorn Neergaard
ce36ee73e9 Fix uplink size 2016-01-19 08:41:51 -06:00
Bjorn Neergaard
d87ddf0790 Add parent call, fixing uplink runtime 2016-01-19 08:41:51 -06:00
duncathan salt
1b2ec539af Merge pull request #14708 from xxalpha/aimoduleinstall 
Installing laws to an empty AI core will now use install() instead of snowflake.
 2016-01-19 07:28:25 -06:00
duncathan salt
f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket 
Fixes the straightjacket
 2016-01-19 07:24:51 -06:00
duncathan salt
ee1067cb5c Merge pull request #14686 from neersighted/mo_tguis 
Mo' tgui mo' commits
 2016-01-18 14:54:12 -06:00
Bjorn Neergaard
aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard
5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -06:00
Bjorn Neergaard
a1ff8e8783 Refactor tgui interactions 
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
 2016-01-18 14:27:56 -06:00
Bjorn Neergaard
b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard
718639a1c3 Add new syndicate logo 
Thanks to @YotaXP
 2016-01-18 14:26:28 -06:00
Bjorn Neergaard
4a617062d8 Refactor uplinks; fix up tooltips and make uplink more interactive 2016-01-18 14:25:52 -06:00
Remie Richards
6752d12ee5 Merge pull request #14696 from Razharas/BibleFix 
Fixes bible producing unlimited stuff
 2016-01-18 20:23:47 +00:00
Bjorn Neergaard
ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
Bjorn Neergaard
1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
xxalpha
8a669c93db Changed aimodule code to use laws datum instead of AI mob. 2016-01-18 03:08:41 +00:00
xxalpha
53b74da4bd Fixes the straightjacket 
More straightfixes
 2016-01-17 22:12:34 +00:00
Buggy123
4da17c198b Never 2016-01-17 16:07:20 -05:00
Buggy123
84ba5cad1f Added tracking for who last touched the grenade, and corrected grammar. 2016-01-17 14:44:39 -05:00
Razharas
ad1c333e89 Fixes bible producing unlimited stuff 
Fixes bible producing unlimited stuff
Fixes https://github.com/tgstation/-tg-station/issues/11298
 2016-01-17 20:04:26 +03:00
Buggy123
bed2037840 Adds detonation tracking to grenades. 2016-01-16 21:58:20 -05:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
tkdrg
990efcbb7a Merge pull request #14526 from KorPhaeron/virus 
Fixes virus grenade kit being empty
 2016-01-09 18:40:58 -03:00
KorPhaeron
a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron
b6474aa48f virus 2016-01-08 15:58:35 -06:00
tkdrg
6c41d0e437 Merge pull request #14468 from KorPhaeron/fuck_off_already 
Stops defibs/cloners notifying suicides when people are trying to revive them
 2016-01-08 18:09:29 -03:00
KorPhaeron
1ce90959ef Notify 2016-01-06 22:40:50 -06:00
SouDescolado
783e669c2d Fixes Tuberculosis kit 
Name was wrong
 2016-01-06 15:52:38 -02:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master 
Merge shit
 2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful 
Less lines, same code.

Trying to fix merge conflict.

Gah
 2016-01-05 14:36:39 -02:00