Zap-zapper
906366bbf3
Size fetish update
2021-03-02 00:58:26 +07:00
Heroman
ef7157ef93
Adds sanity check to switch eyes layer verb
2021-03-01 17:39:03 +10:00
Meghan-Rossi
5e1d3c52b0
Fix parrot runtime ( #7933 )
...
🆑
bugfix - Fixed a runtime when parrots talk over radios.
/🆑
Tested, seems to work fine.
2021-02-28 19:12:27 -05:00
Novacat
a64525866f
Merge pull request #9802 from VOREStation/upstream-merge-7926
...
[MIRROR] Properly cleared ORGAN_CUT_AWAY for prosthetics.
2021-02-28 18:27:51 -05:00
Novacat
538c805601
Merge pull request #9814 from VOREStation/upstream-merge-7820
...
[MIRROR] Adds the Restraining Bolt.
2021-02-28 18:16:22 -05:00
Unknown
5c28be8c30
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926
2021-02-28 18:08:41 -05:00
Novacat
827b30c844
Merge pull request #9787 from VOREStation/upstream-merge-7905
...
[MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
2021-02-28 18:07:37 -05:00
Mechoid
f5ade3682c
Adds the Restraining Bolt.
2021-02-28 18:04:08 -05:00
Unknown
0f6022040d
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926
2021-02-28 17:53:22 -05:00
Novacat
c0e283734d
Merge pull request #9507 from VOREStation/upstream-merge-7796
...
[MIRROR] Adds (Follow) link to emotes for ghosts
2021-02-28 17:51:45 -05:00
Novacat
85485c41c4
Update emote.dm
2021-02-28 17:40:21 -05:00
Heroman
e9431e7567
Fixes prommies still having trashcan var on by default
2021-03-01 03:52:49 +10:00
Novacat
708308065d
Update neutral.dm
2021-02-27 18:42:20 -05:00
Killian
82e99ab778
Update station_vr.dm
2021-02-27 23:38:21 +00:00
Killian
e05436a661
morefix
2021-02-27 23:34:33 +00:00
Killian
3d8b60bc3e
Merge remote-tracking branch 'upstream/upstream-merge-7864' into kk-traits
2021-02-27 20:59:29 +00:00
Killian
0a51569694
Merge branch 'master' into kk-misc3
2021-02-27 20:01:52 +00:00
Novacat
e5d50e48ed
Update frostfly.dm
2021-02-27 13:13:26 -05:00
MistakeNot4892
3e804dc799
Sideports a couple of init unit tests from Neb.
2021-02-27 13:05:16 -05:00
Novacat
db9968a3ff
Merge pull request #9454 from VOREStation/upstream-merge-7783
...
[MIRROR] Reworks stairs to be sensible
2021-02-27 13:02:59 -05:00
TheFurryFeline
c79630baa5
Merge branch 'master' into TFF-Fix_Dem_Stairs
2021-02-27 08:48:08 -05:00
Verkister
4ea4eecf28
Steals and fixes a memory leak fix from the freeloaders
...
-Up-ports a memory leak fix related to preview mannequins.
-Also fixes the forementioned fix breaking fuzzy/sharp previews on setup.
-Also makes the fuzzy/sharp toggle button update the char setup preview.
2021-02-27 12:47:16 +02:00
Killian
81de5d28fa
ITEL v2
2021-02-26 22:49:02 +00:00
Novacat
af5812a12a
Merge pull request #9793 from Heroman3003/silksong
...
Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more!
2021-02-26 16:41:17 -05:00
Heroman
55d5d272bb
Raises the cost to 2 as per admin request.
2021-02-27 07:14:00 +10:00
Schnayy
0adc1f2d11
Properly cleared ORGAN_CUT_AWAY for prosthetics.
2021-02-26 10:11:24 -05:00
Novacat
f14faa7752
Merge pull request #9784 from Heroman3003/dronefix2
...
Fixes drone console not detecting drones outside its own z-level
2021-02-24 19:27:49 -05:00
Novacat
dfeb29fe47
Merge pull request #9783 from TheFurryFeline/patch-27
...
Typo Fixy, Again
2021-02-24 19:27:14 -05:00
Heroman
3aa6d55803
Limits the unlimitedness
2021-02-25 07:53:41 +10:00
Heroman
59e23e7eda
Whoopsie, forgot to actually enable weaving for spooders
2021-02-25 07:40:55 +10:00
TheFurryFeline
a8576eef4d
Re-add src.
...
Will be porting upstream.
2021-02-24 16:38:55 -05:00
Heroman
fb17aa584b
weaversilk instead of web
2021-02-25 07:24:04 +10:00
Heroman
7340461dbe
Converts bindings to the weaving system
2021-02-25 07:18:45 +10:00
Heroman
1b79aaf579
Main-feature-complete
2021-02-25 06:37:13 +10:00
Atermonera
c00ed7e3b1
Added verbs/handling for removing and attaching your own robotic bodyparts.
2021-02-23 17:19:28 -05:00
Atermonera
15bb23c70c
Merge pull request #7923 from Atermonera/respawn_is_respawn
...
Adds Respawn to allow ghosts to return to lobby so admins stop disabling respawn instead because SOMEONE, SOMEWHERE IS WRONG
2021-02-22 23:34:27 -05:00
Heroman
da8c3e2c3f
Fixes drone console not detecting drones outside its own z-level
2021-02-23 07:57:09 +10:00
Heroman
a7234ea2ca
First step
2021-02-23 07:55:36 +10:00
TheFurryFeline
a7b0c4af77
Typo Fixy, Again
...
Fixes double "the" in harvest failure message
2021-02-22 11:06:23 -05:00
Unknown
c464b27dfd
More compat fixes
2021-02-21 17:25:58 -05:00
Novacat
bcaf7dcdff
Merge pull request #9445 from VOREStation/upstream-merge-7369
...
[MIRROR] Department and Round Goals
2021-02-21 17:14:47 -05:00
Unknown
a3aaa128cb
Compatability
2021-02-21 17:12:49 -05:00
Atermonera
32e08ebc59
Reworks stairs to be sensible
2021-02-21 17:02:08 -05:00
Novacat
278c3eaa3f
Merge pull request #9761 from VOREStation/upstream-merge-7891
...
[MIRROR] Porting Fixes
2021-02-21 11:02:07 -05:00
Novacat
073239ba78
Update mecha.dm
2021-02-21 09:39:56 -05:00
Verkister
6658e3f53f
I'm glad we're gonna be the upstream soon
2021-02-21 15:53:53 +02:00
Verkister
84ef8b26c9
Fixes missed merge conflict hair stuff
2021-02-21 15:42:54 +02:00
Verkister
f92b3b7639
Update blank_vr.dm
2021-02-21 00:23:43 +02:00
Verkister
44c88c1d55
Fixes some species jank
...
Obsolete comments can be dangerous.
2021-02-21 00:08:03 +02:00
Novacat
13c59371c9
Porting Fixes
2021-02-20 02:08:18 -05:00
