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
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

324 Commits

Author SHA1 Message Date
Cheridan
dc5cb310d7 Merge pull request #13807 from KorPhaeron/cloak_of_shadows 
Removes cloak of shadows
 2015-12-20 10:56:27 -06:00
KorPhaeron
c7018ff580 Removes cloak of shadows 2015-12-19 08:04:43 -06:00
Xhuis
7fc726c00a Changes bloodcrawl define location 2015-12-18 17:51:10 -05:00
Remie Richards
7bab23de9b Adds pentagon as a possible orbit type 2015-12-18 16:12:45 +00:00
Remie Richards
163c84344b Orbit improvements: 
* Orbit is now less reliant on Animate(), for most ghosts this means 36 calls to Animate, vs the previous INFINITE, for those of you with potato computers, this should ease the pain and crashing.
* Orbits can now be something different to circles!
* Ghosts Byond Members can now choose between orbits! (Circle, Triangle, Square, Hexagon)
 2015-12-18 16:12:42 +00:00
KorPhaeron
57d29d11d4 Replaces malf with traitor AI 2015-12-18 00:05:30 -06:00
Cheridan
a973a2518b Merge pull request #13585 from KorPhaeron/reactive_expansion 
Reactive mechanics expansion and shooting grenades/flamethrowers out of peoples hands
 2015-12-17 17:05:53 -06:00
MMMiracles
392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
as334
32e68cfab0 Hopefully fixes the negative moles/heat bugs with fusion, as well as it being a bit overactive in fires. 2015-12-14 19:24:46 -05:00
Cheridan
2a6a63253b Merge pull request #13608 from KorPhaeron/fire_defines 
Makes burn_state use defines
 2015-12-14 10:44:10 -06:00
as334
cf9c1daf92 Haha whoops 2015-12-13 15:47:31 -05:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
as334
8f2d65c446 Adds a new gas reaction, plasmic fusion. 2015-12-12 12:32:28 -05:00
KorPhaeron
1f09a14f58 Merge remote-tracking branch 'refs/remotes/tgstation/master' into reactive_expansion 
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
 2015-12-12 01:12:59 -06:00
KorPhaeron
09c95d9551 Grenades, flamethrowers, better shields 2015-12-12 00:34:04 -06:00
MMMiracles
b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
Nerd Lord
746c7738c9 Fixes revenant antag pref being impossible to toggle. 2015-12-09 22:15:45 -05:00
MMMiracles
6c685d6d67 wew 2015-12-06 02:14:26 -05:00
Jordie
c018b514d2 Merge pull request #13401 from GunHog/Of_Bots_And_Diagnostic_HUDs 
Adds Bots to Diagnostic HUDs
 2015-12-06 17:19:56 +11:00
MMMiracles
8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 
Conflicts:
	icons/mob/animal.dmi
 2015-12-04 18:55:10 -05:00
Bjorn Neergaard
9c997c2be0 Make remove buttons for whole beaker, not individual chems 
Also re-arrange chemistry because that crap is whack...
Also, clean up chemistry code's variables...
Death to colons!
 2015-12-03 14:33:28 -06:00
GunHog
4b7b8a0e94 Adds Bots to Diagnostic HUDs 
- Adds bots to the Diagnostic HUD.
- Fixes mode tracking issues with AI's botcall interface
- Added Sentience tracking to bots in PDA and AI displays
- New HUD sprites by WJohnston
- Moved bot defines to its own file so it can be used properly.
 2015-12-02 16:16:33 -06:00
MMMiracles
77b36e2415 iced windows, more ice variants of shit in general. 
more stuff, ice everything.

wew

conflict fix
 2015-12-01 16:45:09 -05:00
Razharas
e091d35439 Merge pull request #13334 from AnturK/botfix 
Bot fixes
 2015-12-01 21:00:23 +03:00
Vincent
16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT 
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
 2015-11-30 20:26:03 -05:00
AnturK
b216ffe457 Fixes Player bots moving while deactivated 
Fixes Player bot radios
Removes unused HEADSET_SECURE radio mode
Adds secbot/ed209 stuns to attack log
Allows player mulebots to drop the cargo by resisting
 2015-11-30 14:07:38 +01:00
Razharas
e715e1cc57 Merge pull request #13195 from neersighted/nanoui_update 
[WIP|DNM] Update NanoUI
 2015-11-28 14:17:49 +03:00
Remie Richards
62d301bfe5 Merge pull request #12998 from YotaXP/drone-fixes 
Allows drones to use 'pick up' and watertanks
 2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
Bjorn Neergaard
6a6262d6b2 Finish refactor/retooling of NanoUI core 
Also:
* Fix NanoUI on IE11+
* Add missing files (oops!)
 2015-11-26 22:17:53 -05:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Bjorn Neergaard
4e5edf396a Update NanoUI 
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
 2015-11-26 07:11:27 -05:00
phil235
34a3dcba9f Merge pull request #12879 from MrStonedOne/burnbabyburn 
Tweaks burn rate such that fires last longer but bombs are weaker.
 2015-11-25 14:10:50 +01:00
Incoming
e03f468c7e Macro??????? 2015-11-17 01:06:10 -05:00
as334
a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
YotaXP
47c358e8e2 Adds slot_drone_storage macro. 2015-11-12 20:32:00 -05:00
duncathan salt
df6ac90baa Revert "Revert "Merge pull request #12067 from AnturK/resequencing"" 2015-11-12 15:25:31 -06:00
Razharas
3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing" 
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
 2015-11-12 21:11:50 +03:00
duncathan salt
b1d1ecb81f Merge pull request #12904 from Incoming5643/action_action_action_action_action 
Adds action buttons for slimes
 2015-11-11 15:21:05 -06:00
Incoming
d8a0dc6b54 jumps through hoops to save two lines 
adds slime growth as a define
 2015-11-11 16:00:38 -05:00
AnturK
d82010caf3 Makes injectors timed 
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
 2015-11-11 17:27:55 +01:00
Jordie
07464d1f10 Merge pull request #12911 from Shadowlight213/DbJobunban 
Allows database based jobban lifting via the jobban panel
 2015-11-09 15:47:10 +11:00
Shadowlight213
6a2f02fa47 Allows Database based jobbans to be lifted via the jobban panel. 
Jobbans lifted this way take into effect the same round.
 2015-11-07 14:57:08 -08:00
MrStonedOne
7410fb89be Tweaks burn rate. 
This will result in longer fires and less explody TTV bombs.

God help us all.
 2015-11-06 04:46:34 -08:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts 
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
 2015-11-02 01:06:30 -03:00
MrStonedOne
8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
Remie Richards
f3266a411c Merge pull request #12661 from KorPhaeron/mudamudamuda 
Parasite HUD and rebalancing
 2015-10-30 05:19:07 +00:00
Razharas
fc0ea9311b Merge pull request #12614 from GunHog/Diag_Huds 
Diagnostic HUDs
 2015-10-30 06:25:48 +03:00
KorPhaeron
49dfb52cea Parasites 2015-10-25 21:42:47 -05:00
GunHog
ac7be61569 Adds Mechs and Borg cells to HUD 
- Cyborg cells are now tracked.
- Mech health, cells, and status now tracked
 2015-10-22 18:45:08 -05:00