Commit Graph

512 Commits

Author SHA1 Message Date
Razharas
7ce5b8a42b Merge pull request #12492 from optimumtact/patch-1
Brings some sanity to do_after and do_mob
2015-10-22 09:32:24 +03:00
oranges
245f574cab Brings some sanity to do_after and do_mob
cleans up progress bar handling and also reworks how the loops work to cut down on some of the copy pasta.
2015-10-21 09:10:00 +13:00
Jordie
8a35115f1d Merge pull request #12493 from Shadowlight213/Banhancements
Adds alien jobbans and adds jobban and pref support to various events
2015-10-20 15:21:40 +11:00
Shadowlight213
435fbb4653 Fix 2015-10-18 16:24:26 -07:00
Shadowlight213
35ca96331e Adds jobban support to syndicate borg
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
2015-10-18 15:25:14 -07:00
xxalpha
8b5d037a85 Added ultra_range() proc.
Comment

For loop optimization
2015-10-18 19:12:36 +01:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
Kyle Spier-Swenson
997d86684a Fixes orbit breaking on shuttle move.
Fixes #12160
I moved this check out of the while because I didn't want to have to trigger two separate calls to get_turf.
Also fixes an edge case where orbiting a turf could cause runtimes.
2015-10-04 18:46:42 -07:00
MrStonedOne
8f98f31110 Orbit tweaks!
Removes spawn from orbit proc, This allows atoms to override their orbit and use ..() to have code run before and after the orbit. Things that needed the spawn can spawn on their own.

Tweaks orbit's pre-orbit sleep to take into account the animation of the inital transform.

Ghost orbits have been given less checks, You can now re-orbit something and orbit yourself; Because why the fuck not.

Ghost orbits now change the orbit radius based on the icon size of the thing they are orbiting.(for orbiting the singulo) There is a few bugs with this, but they are byond bugs, and only come out at higher fpses.
2015-10-02 07:14:43 -07:00
Cheridan
bf26bdfd5d Merge pull request #12078 from optimumtact/patch-3
Removes commented out test code
2015-09-30 23:53:49 -05:00
oranges
7827f0104b Removes commented out test code 2015-09-30 15:16:02 +13:00
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
xxalpha
22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha
3d15d791fb Merge branch 'edgy' into hot_or_not
Conflicts:
	code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha
deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas
01a23d020e Merge pull request #11848 from xxalpha/smoothlattice
Lattices and catwalks now use generic icon smoothing.
2015-09-24 01:39:12 +03:00
xxalpha
36ae116a48 Added another mode for smoothing (smooth with all subtypes). 2015-09-23 00:55:10 +01:00
Xhuis
6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
xxalpha
fc073def62 Merge remote-tracking branch 'upstream/master' into smoothlattice 2015-09-22 19:40:01 +01:00
Razharas
835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
Jordie
32932ae7d5 Merge pull request #11896 from KorPhaeron/forsaeg
Admin Verb: Offer Control
2015-09-22 12:26:23 +10:00
KorPhaeron
b8b28c07e2 poll time 2015-09-21 09:58:15 -05:00
KorPhaeron
12bc0caa3a Updates pollCandidates 2015-09-21 09:45:28 -05:00
phil235
6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02: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
Xhuis
da8f533c21 Conflicts 3/3 2015-09-19 14:07:52 -04:00
xxalpha
6bdd100eb6 Lattices and catwalks now use generic icon smoothing.
Put another check in smooth code to prevent runtimes
2015-09-19 14:55:09 +01:00
Remie Richards
b9b73f3ebe Merge pull request #11847 from MrStonedOne/patch-40
Orbit fixes
2015-09-19 14:12:01 +01:00
Swag McYolosteinen
9e24350297 Merge pull request #11593 from AnturK/misc
Abductor QoL & Event
2015-09-17 19:25:38 +02:00
Kyle Spier-Swenson
a3f8df3e69 Update unsorted.dm 2015-09-17 10:23:08 -07:00
Kyle Spier-Swenson
7f964fbf8c Orbit fixes
Fixes orbiting an atom that is not on a turf blocking the orbit
Fixes #11783
Fixes loc changes while orbiting as ghost not breaking orbit like movement does.
Fixes #11777
Fixes Orbit being called in quick succession on the same atom breaking the transform
(unreported)
Fixes all other edge cases with multiple orbit calls in quick succession.
2015-09-17 10:19:13 -07:00
Remie Richards
38605d1aee Merge pull request #11712 from MrStonedOne/patch-37
Ghost follow is now an orbit!
2015-09-13 16:42:05 +01:00
Kyle Spier-Swenson
cf390ae1ef Fixes orbiting a deleted atom sending you to null space
This also handles the garbage collection issues. As far as i'm concerned, if its been qdeled, but loc isn't null, it's fair game for orbits.
2015-09-13 08:35:22 -07:00
Swag McYolosteinen
d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands
Inhands can now come in ANY SIZE, not just 32x32!
2015-09-13 17:23:36 +02:00
Remie Richards
82e577be0b Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items!
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
2015-09-12 00:45:14 +01:00
Kyle Spier-Swenson
144402c8c7 I slept so I should make sure A still exists 2015-09-11 09:19:04 -07:00
Kyle Spier-Swenson
fa73524804 Some code clean up 2015-09-11 07:33:30 -07:00
Kyle Spier-Swenson
28e550d8c1 Fixes bug where orbiting while orbiting would break orbits 2015-09-10 23:17:27 -07:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
AnturK
daf8875103 Adds the flag filter to pollCandidates 2015-09-07 12:50:35 +02:00
AnturK
6df9d4975a Adds abductor event
Adds event gamemode white/blacklist
Moves and renames some helper procs
Some QoL for baton
2015-09-05 20:08:30 +02:00
Razharas
305cbb644c Merge pull request #11288 from Robustin/AnnouncementsFix
Fixes Announcements Garbling
2015-09-01 10:29:58 +03:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0
8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
Aranclanos
20ba3071ed Fixes the brand intelligence event not triggering the uprising under certain conditions.
Adds a new proc for the list helpers, removeNullsFromList() It does what it says.
2015-08-24 07:52:54 -03:00
Robustin
458db2011d Fixes the apostrophe issue
Maybe... Doubtfully... But I wanted to give it a try since I'm tired of my glorious pronouncements garbled in &39

If I actually fixed it then I should get a medal for best coding by someone who can't code. My logic was that WHISPER works just fine with apostrophes and ampersands but shuttle call reasons, announcements, etc. would get that garbled text when using apostrophes and ampersands.

With whispers trim is on the "inside", with stripped_input that is used for these announcements trim is on the "outside". It makes intuitive sense to me that whoever wrote that stripped_input comment might have gotten things flipped since if trim is on the inside, and it allows single symbols to pass through, then there's nothing to filter html_encode from spewing that garbage out.

If this isn't the correct fix then at least I should be close enough that someone can point me in the right direction.
2015-08-19 15:39:31 -04:00
Swag McYolosteinen
46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
c0
a06271733e Fixes and changes 2015-08-12 20:31:35 +03:00
Remie Richards
9ca1f2f262 VV and VV Mass Modify now accept variables when editing a string variable, this allows you to embed variables in string variables, variableception. 2015-08-11 04:52:48 +01:00