Commit Graph

254 Commits

Author SHA1 Message Date
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
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
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
GunHog 96317030a1 Diag HUDs 2
Adds Diagnostic HUDs
2015-10-22 08:15:09 -05:00
AnturK 7bf76c115a few more 2015-10-21 22:36:21 +02:00
AnturK 9ffc841bfb Makes is_type helpers inline 2015-10-21 22:22:58 +02:00
as334 42971f8fd6 Merge https://github.com/tgstation/-tg-station 2015-10-20 16:51:24 -04:00
Razharas 78416379dd Merge pull request #12484 from RemieRichards/Nyehhehheh
Allows Species to set custom say spans.
2015-10-19 21:45:03 +03:00
Remie Richards ec3be464f3 Allows Species to set custom say spans. 2015-10-18 17:17:27 +01:00
phil235 a7bc8475d8 Fixes winter coat hood sprite appearing as a bucket.
Removing Smile, Swedish, Chav and Elvis from genetics. These mutation can still be acquired via adminspawned dna injector. Added a dna injector for laser eyes mutation.
Fixes using razor on non human shaving non existent hair.
Fixes chair deconstruction dropping too much metal.
Adding some necessary check for mob buckling in gibber, processor and monkey recycler code, and in ventcrawling proc to fix being able to enter pipe while feeding as a slime.
Fixes snapcorn not giving seeds.
Fixes portable chem dispenser.
2015-10-17 16:29:11 +02:00
as334 bc9b2484d7 Initial Commit 2015-10-15 22:43:05 -04:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Jordie0608 398a3ea1d1 unmagics polltypes into defines 2015-10-05 17:44:37 +11:00
Remie Richards 131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards 58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
Razharas 14d54d3ef2 Merge branch 'duncathan-hemanifolds' 2015-09-25 16:45:57 +03:00
Razharas 9d8cf0ffe9 Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds 2015-09-25 16:35:08 +03:00
Razharas b9b8734b74 Merge pull request #11966 from MMMiracles/dwarfsman
Dwarfism
2015-09-25 12:18:52 +03:00
MMMiracles 1c130c03fe insert 'too-short' joke 2015-09-24 21:07:44 -04:00
xxalpha deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
MMMiracles 3d43b8e389 dwarfdwarfdwarf 2015-09-23 18:13:16 -04:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00