Commit Graph

475 Commits

Author SHA1 Message Date
tigercat2000
48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
uraniummeltdown
658bc95af0 diagonal icon smoothing support
added example diagonal smooth wall
abductor and survival pod walls smooth diagonally
new define for space icon state
fixed abductor walls having no sheet_type
2017-11-29 14:02:13 +04:00
Fox-McCloud
6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
Crazy Lemon
86676221b5 Merge pull request #8242 from Allfd/vamp
Makes vampires more containable
2017-11-10 12:29:43 -08:00
tigercat2000
12949e24f8 Merge pull request #8184 from Birdtalon/ticket-machine
Birdtickets: Adminhelp based ticket system
2017-10-27 09:24:06 -07:00
tigercat2000
df597ff2d0 Merge pull request #7851 from Aurorablade/EmotesAndShit
Emotes and shit
2017-10-22 12:08:02 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07:00
Alffd
59b20f8f33 Makes vampires more containable 2017-10-17 20:40:45 -04:00
tigercat2000
b141323e08 Merge pull request #7800 from Citinited/clipboard-improvements
Makes clipboard code less horrible
2017-10-15 19:40:57 -07:00
Citinited
acc6aaa73a Tigercat formatting changes 2017-10-16 03:29:22 +01:00
Aurorablade
b5c0d7d58d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EmotesAndShit 2017-10-15 21:15:01 -04:00
tigercat2000
b316f484e6 Merge pull request #7609 from Vivalas/splint_nerf
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04:00
Birdtalon
550db12717 user feedback, updates adminhelp string, replying to a ticket stops stale counter 2017-10-01 23:18:51 +01:00
Fox-McCloud
003277a89d Merge remote-tracking branch 'upstream/master' into lungsss 2017-09-17 01:02:33 -04:00
tigercat2000
60e287c019 VV Refactor
Ports /tg/'s VV refactor. Most of this is just cleaning up and making it
easier on the coders, but everyone else benefits too:

 - Mass mod no longer freezes the server (CHECK_TICK <3)
 - Attempting to change any of the step_* values or anything that will
 otherwise disable pixel movement will now prompt you and ask if you are
 sure you want to continue
 - You can actually enter |text| again in a box, rather than being
 forced to always use the multi-line input
 - Cookies! VV saves your search and scroll position for a given UID,
 rather convenient for debugging
 - The refresh button on /clients works finally
 - You can view lists in detail by clicking on them like any other
 reference, and edit them directly that way. This also means there is no
 hard limit on how many variables you can see in a list before it's
 truncated- it will just be hidden until you view the list in VV
 directly.
 - You can shuffle lists and clear duplicate/null entries.
 - Mildly reordered the stuff in the dropdown, inconvenient but
 necessary.
2017-09-14 14:08:38 -07:00
Vivalas
4fb6c0365e Merge remote-tracking branch 'upstream/master' into splint_nerf 2017-09-09 19:21:33 -05:00
tigercat2000
c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Fox McCloud
70cd062699 Merge pull request #7999 from Birdtalon/door-remote
Buffs the HoP Door remote
2017-08-28 18:23:55 -04:00
Landerlow
71be8f3c8b Adds more roundstart disability options 2017-08-25 18:44:33 +02:00
Birdtalon
edb8c83bb1 fixes my derp 2017-08-22 16:19:22 +01:00
Birdtalon
d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
Fox-McCloud
4479185d6e Merge remote-tracking branch 'upstream/master' into lungsss 2017-08-16 19:20:19 -04:00
tigercat2000
ebabda1223 Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
Vivalas
dc0a008fe2 Merge branch 'master' into splint_nerf 2017-08-13 23:13:24 -05:00
Fox-McCloud
9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Fox-McCloud
d1e9166687 tweaks 2017-08-02 16:37:53 -04:00
Fox-McCloud
e3d425aae3 eh 2017-07-26 16:29:05 -04:00
Fox-McCloud
b12baedada ok there TG, let's let BYOND do something better... 2017-07-25 20:50:16 -04:00
Fox-McCloud
f78c507122 Sound Update/Refactor 2017-07-25 20:35:38 -04:00
Aurorablade
f6bff97ac3 highfive adjustment 2017-07-24 22:13:50 -04:00
Crazy Lemon
d9a64e23bf Merge pull request #7333 from FlattestGuitar/taste-test
Adds a taste system!
2017-07-24 11:53:35 -07:00
KasparoVy
ff6f7f9644 Updates SQL Version
Includes my query.

Thanks Tigercat2000 and Allfd.
2017-07-22 20:14:30 -04:00
tigercat2000
3818d57f3d Merge pull request #7755 from Allfd/sqlcontrol
SQL version control
2017-07-22 10:49:16 -07:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Fox-McCloud
02f74932e2 Fixes IPC and Diona Knockdown Immunity 2017-07-20 21:01:55 -04:00
Fox-McCloud
77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Alffd
352fde7eed SQL version control 2017-07-16 19:53:09 -04:00
Fox-McCloud
cb35d1f6e9 Binsult.ogg 2017-07-15 12:12:59 -04:00
Fox-McCloud
5073247210 lips 2017-07-14 21:46:48 -04:00
Fox-McCloud
d35a5ea6e3 virus immunity trait not var 2017-07-13 19:47:23 -04:00
Fox-McCloud
b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
FlattestGuitar
6499f31df4 Merge me a river 🎶 2017-07-12 21:13:20 +02:00
Fox-McCloud
e02946f3e7 Blood Refactor Fixes 2017-07-12 02:14:53 -04:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00
Fox-McCloud
fe6481f86f Buffs Advanced Mop 2017-07-04 21:45:15 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00