515fb58163
Can now collar any animal that has gained sentience.
...
This makes it so that upon becoming sentient, either by the xenobiology sentience/transference potion or by the random sentience event, it is possible to put a collar on you.
2019-03-22 16:52:14 +01:00
1a59687c7a
Merge pull request #11091 from Mitchs98/Dionaname
...
Fixes Diona Naming for ID's.
2019-03-22 17:56:21 +08:00
eee376ba0d
Merge pull request #11052 from Fox-McCloud/goon-smoke
...
[Goonchem] Implements Goon Smoke
2019-03-22 17:45:11 +08:00
d6c31bc580
Merge pull request #11043 from UmeFuu/UmeFuu-Hairs
...
Ume fuu hairs
2019-03-22 17:42:48 +08:00
40237e7067
Capitalizes all parts of Diona Name
...
Fixes Diona Naming for ID's.
2019-03-22 02:37:41 -05:00
85b9fe2ebe
lower fire damage
2019-03-21 16:28:46 -04:00
46e550d025
Cat and Mouse choose from emote_hear list
2019-03-21 14:41:35 -04:00
a34f1054ce
Add Cat/Corgi emotes and sounds
...
Organized creature sounds into creature sound folder.
2019-03-21 14:35:00 -04:00
aba98f6cb2
fake hotspots
2019-03-20 17:11:30 -04:00
45ccc65450
Merge pull request #11085 from Dave-TH/I_know_kung_fu
...
Fixes Krav Maga Disarms
2019-03-20 15:20:40 -04:00
6328051e45
Fixes Krav Maga Disarms
2019-03-20 12:47:46 -04:00
23954aece6
that's a lot of fire
2019-03-20 00:19:12 -04:00
122c17a006
oh no fox lost it
2019-03-19 18:23:04 -04:00
eedc8afa8e
reagents mob temp
2019-03-19 14:58:53 -04:00
ea752e7191
safety
2019-03-19 03:10:47 -04:00
de09634df1
fixes black powder
2019-03-19 01:53:30 -04:00
e98f1b36e2
this for now
2019-03-19 00:15:59 -04:00
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
c5f5fef912
Alphabetical prefs
2019-03-18 17:28:01 +00:00
e83a7131cc
Refactored pickup code and fixed the bug
2019-03-18 16:42:44 +01:00
9631eef2aa
Fixed the middle mouse exploit
2019-03-18 14:53:41 +01:00
db7baf3915
Merge remote-tracking branch 'upstream/master' into pill-bottles-and-patch-packs
2019-03-17 23:27:52 -04:00
d61bbe807d
[Goonchem] Pills, Bottles, Patches, and Pillbottles
2019-03-17 21:30:10 -04:00
024a393fe9
Merge pull request #11057 from farie82/no-more-force-on-dview
...
Should make it so that dview can not bump into alive people anymore
2019-03-17 22:11:50 +08:00
675ef68422
uses move resist now
2019-03-17 14:41:31 +01:00
570678a41f
Merge pull request #10896 from Jazz23/Xenobio-Addition
...
Xenobio TG port
2019-03-17 20:36:16 +08:00
f6927792ea
Merge pull request #10953 from AffectedArc07/prisonconsole-fixed
...
Prisonconsole fixed
2019-03-17 19:23:17 +08:00
1131133d59
Confirmation
2019-03-17 10:17:39 +01:00
c7b560f842
Merge pull request #11045 from Kyep/ventcrawl_buckle
...
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
ce34a6ccb1
Merge branch 'master' into prisonconsole-fixed
2019-03-16 17:54:31 +00:00
efa369162c
Merge pull request #10853 from Ty-Omaha/ssd-miasma
...
SSD Miasma
2019-03-16 09:22:46 +08:00
f01af6ae20
Implements Goon Smoke
2019-03-15 19:09:29 -04:00
ca773c32dc
Fixes ventcrawl while buckled to something
2019-03-15 03:33:48 -07:00
81ec0cfe8c
Adds new hairs (code)
...
What does this PR do:
Adds about eleven new hairs, some of them are edits from other hairs requested by some people, credits to the original spriter/s
2019-03-14 04:37:38 -03:00
9d821534a5
Merge pull request #10845 from Quantum-M/bureaucraticUpdate
...
Updates stamps and adds contract sprites.
2019-03-14 15:04:40 +08:00
6a2067f9c4
Merge pull request #10795 from Quantum-M/alienOrgans
...
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
2019-03-14 15:04:29 +08:00
dcd9ea8278
Merge pull request #11030 from Couls/shesi-fluff-fix
...
Update shesi's fluff sprites and add in a custom winter hood
2019-03-14 14:43:48 +08:00
238b73121f
Asset logging
2019-03-14 00:42:17 -04:00
1978637be4
safety/is_admin_level, special_role alert, !job check
2019-03-13 06:06:41 -07:00
1fb7a24dbc
cleanup
2019-03-12 19:26:00 -07:00
db6484b027
Fox update
2019-03-12 19:05:19 -07:00
379735e899
Consistency fixes
2019-03-12 18:58:50 -04:00
cc7d2606be
Update shesi's fluff sprites and add in a custom winter hood to go with the coat
2019-03-12 18:24:04 -04:00
58b42c6566
sql updated now as well
2019-03-12 20:26:09 +01:00
f8a5e81ea2
Popups can now be limited to 1
2019-03-12 20:11:20 +01:00
2db1ea7e34
Fix conflicts
2019-03-11 03:04:47 +00:00
f1716ed14a
fixes conflicts
2019-03-11 02:55:21 +00:00
4e1e55b9e9
Fix spacing errors
2019-03-10 18:00:49 -04:00
9037aa2d87
Hotfix
...
send proper message about karma gains, display a message about whether it's enabled or not at roundstart for less confusion
2019-03-10 16:05:02 -04:00
6c3fc730a8
Shadeykins
2019-03-10 06:07:49 -07:00
Eman