5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
a275a787c1
Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815
...
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
4636817ab5
Update packs.dm
2018-04-04 17:18:36 -04:00
740c76beb9
damn
2018-04-04 13:23:15 -05:00
34fe469aa2
hold on
2018-04-04 13:22:27 -05:00
c2615881c7
ah
2018-04-04 13:21:42 -05:00
e7612b44fe
should fix it all
2018-04-04 13:19:59 -05:00
e14ff635ec
okay
2018-04-04 13:18:54 -05:00
7459b8b03c
hhhj
2018-04-04 13:16:49 -05:00
c27cb38a53
hhh
2018-04-04 13:14:30 -05:00
53454d8ab9
d
2018-04-04 13:13:30 -05:00
3b4b557687
a
2018-04-04 13:12:52 -05:00
d2cf2e8018
HMMM
2018-04-04 13:12:27 -05:00
d845bf84a9
k
2018-04-04 12:56:34 -05:00
a4e3b19891
maybe
2018-04-04 12:55:52 -05:00
417fa9e264
yes
2018-04-04 12:52:40 -05:00
cee51cd79d
should fix conflicts
2018-04-04 12:50:02 -05:00
7b91a07658
kek
2018-04-02 19:53:36 -07:00
89f382df4e
Merge pull request #6025 from Poojawa/increase-age-gap
...
Increase age gap
2018-04-02 06:57:24 -05:00
5dbb046757
Merge pull request #6131 from deathride58/gearIDwhitelists
...
Adds support for manipulating gear entries via config
2018-04-02 05:50:10 -05:00
b09d271e17
Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize
...
(Partially) Globalizes Polychromic Clothing Code
2018-04-02 05:43:18 -05:00
2d038f3f94
gay
2018-04-01 18:31:26 -05:00
75a49c53c8
Fixes dogborg sitting ( #6112 )
2018-04-01 04:06:10 -05:00
d36fac0662
another donator item
2018-03-31 21:49:15 -05:00
a4d949816b
increased glove csost
2018-03-30 13:38:07 -05:00
7bffe7110b
OctopusTime
2018-03-29 18:32:05 -07:00
7015e631a2
Fixes everything, adds loadout stuff
...
"Fix" mandates the usage of workarounds
2018-03-29 23:51:55 +08:00
77f40b6be9
Merge pull request #6093 from Michiyamenotehifunana/no-more-mk37
...
Removes the Mk.37
2018-03-27 17:53:12 +00:00
fb97695b6a
Globalized, Broke everything
2018-03-27 22:40:27 +08:00
3323a5e284
adds the ability to define gear entry whitelists via config
2018-03-27 01:33:02 -04:00
0baeeb548d
Merge pull request #6094 from Citadel-Station-13/kevinz000-patch-1
...
Increases arousal performance, bandaid patch
2018-03-26 22:39:11 -05:00
c579d81f4c
Vore fixes and a few additions ( #6032 )
...
* Fixes saving memes, Adds absorbing and OOC escape
Also allows for people to reload from a slot if they fuck up and delete a belly
* makes sure travis won't flip the fuck out
* fixes some sound issues
* cleaning up some extra sounds, also dragon vore sound settings
* fixes resisting out of guts
* BRACKETS
* Prey now become blind after being eaten.
Use the audible subtle message to continue roleplaying with them!
* Actually make bulges show up in examine
* Fixes cases where transfering between bellies would blind twice
Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
2018-03-26 04:46:50 -05:00
77872a1526
makes IPCs bleed oil ( #6054 )
2018-03-24 12:35:17 -07:00
b70381c89e
Adds IPC Antennas ( #6049 )
2018-03-24 12:33:19 -07:00
04a761838d
Makes blood cult combat rework compatible. ( #6085 )
...
* Update blood_magic.dm
* Add files via upload
* Update blood_magic.dm
* Update blood_magic.dm
* Update tgstation.dme
* oops i used the wrong backslash
2018-03-24 12:32:39 -07:00
2cd98340de
typed
2018-03-24 06:08:58 -07:00
c73d2763e5
Update arousal.dm
2018-03-24 05:52:08 -07:00
bef056c034
why did we have that there
2018-03-24 05:39:35 -07:00
037d800e34
performant arousal
2018-03-24 05:37:49 -07:00
a9bdb032e7
removes code bloat
2018-03-24 14:21:14 +08:00
cdf0ba3def
Oops
2018-03-23 12:18:48 -05:00
3eecb782b9
COUGH COUGH SMOKING COUGH
2018-03-22 23:57:25 -05:00
8d74f7a791
moustache
2018-03-22 23:54:24 -05:00
798b10d28b
more gloves
2018-03-22 23:48:58 -05:00
e7ffc961bc
polychromic nerds
2018-03-22 23:39:11 -05:00
fe39a5a550
MOVED TO HERE
2018-03-22 23:28:33 -05:00
cba5016ab3
Merge branch 'master' into increase-age-gap
2018-03-22 19:53:48 -05:00
68b0ecc48e
forgot science, whoops
2018-03-22 19:52:55 -05:00
c9e8478f24
reee
2018-03-22 19:50:40 -05:00
d4a4c7b0bf
Update uniform.dm
2018-03-22 14:28:20 -05:00
Poojawa