077686c11c
Crew can come to work looking professional
...
not that any of our players act that way
2020-11-20 18:57:19 -05:00
42d33e2b78
Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into sprayfixes
2020-11-10 11:51:19 -03:00
e56b7226c5
Revert "new size"
...
This reverts commit 640786d203
2020-11-09 21:29:00 +00:00
640786d203
new size
...
new size
2020-11-09 21:21:44 +00:00
1e3b069017
New erect penis sprites.
...
New erect penis sprites.
2020-11-09 20:45:29 +00:00
f138e5cf53
Fixing Hypospray
...
Unmodularize MkII hyposprays and other reagent items sprites.
2020-11-09 16:45:17 -03:00
cde46675f3
Fix examine
2020-11-09 16:15:14 -03:00
3a84791e6c
Merge pull request #9380 from Ghommie/Ghommie_cit212
...
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-03 01:32:15 -03:00
859dfd24f5
synthliz bloodtype
2020-10-31 00:23:24 -03:00
9acf8ffd40
merge conflict drinks.dmi
2020-10-29 13:50:19 -03:00
45f7b020c4
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
2c7c66fc89
Merge pull request #9589 from Ghommie/Ghommie-cit259
...
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
4207015199
CitRP Fluffy Jackets
2020-10-26 14:30:59 -07:00
fd44d1a9fd
Fix PR #584 and some additions for lockers and kink vendor
2020-10-23 23:19:34 -03:00
79f6e56852
Revert "Additional loadout polychromatic gear"
2020-10-23 16:40:02 -06:00
e73bc36749
Merge pull request #584 from BHyran/Kromatose
...
Additional loadout polychromatic gear
2020-10-23 16:29:37 -06:00
0719169693
Merge pull request #603 from ArchieBeepBoop/gibspawner
...
Mass Merge - The Blood System Rework & A metric fuckton of runtime fixes
2020-10-23 16:20:26 -06:00
9d1c810742
Merge pull request #602 from Tename/vale
...
Questionable attempt at porting Vale borgs
2020-10-23 16:15:14 -06:00
bbd09dc271
Synthetic Lizard Scream
...
The synthetic lizard can now do the silicon scream.
2020-10-19 04:24:09 -07:00
9b7eee0a89
merge conflict
2020-10-18 16:54:22 -03:00
6163b7c963
GRUG SMASH RUNTIME
2020-10-18 04:34:21 -03:00
2e75188a0b
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
c91a106b0d
fixes and runtimes
2020-10-17 23:55:40 -03:00
1fb7d6ff90
bloodbankfix
2020-10-17 23:25:39 -03:00
8a50607bca
blood
2020-10-17 22:56:13 -03:00
682eb7b9b6
gotta make sure this works yo
2020-10-17 22:25:29 -03:00
cc26593463
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
bb8e3eb2f6
God I suck at this
2020-10-17 11:08:13 -07:00
6e5d8c97d4
Barless versions of the new Synth face
2020-10-16 13:47:56 -07:00
325ec81382
formatting fixes
2020-10-16 13:46:51 -05:00
68c4354c38
brings back the old snouts
2020-10-16 13:32:29 -05:00
c635ca1c74
Revert "Merge pull request #595 from ToonClyde/New-Synth-Body"
...
This reverts commit bd905d2ce2
2020-10-16 12:00:54 -05:00
35eec49f08
fixed a spelling error
2020-10-15 19:34:00 -07:00
50156f8f02
Synthliz face overhaul
2020-10-15 19:23:06 -07:00
e536168d4f
Changeling Fix
...
Size and clothesplosion
2020-10-12 18:04:56 -05:00
835b327f06
Additional loadout polychromatic gear
...
Reused assets from military jacket, polyshorts, and polychromatic stripper outfit to create three additional clothing options, then added to the loadout menu.
2020-10-12 12:38:35 -05:00
121919db3a
Merge remote-tracking branch 'upstream/master'
2020-10-11 01:58:21 -05:00
ac36a86763
some fixes
2020-10-11 01:10:43 -05:00
f84f10681e
Lipstick to the loadout!!
2020-10-11 01:06:18 -05:00
0756155230
Merge pull request #564 from Kabramen/sounding
...
Sounding Rod
2020-10-10 23:16:24 -06:00
4cb2430518
Deer Rework
2020-10-09 02:16:08 -07:00
ab2c32decd
Sounding Rod
2020-10-07 19:11:18 -03:00
aa7d47a23b
Examine Code Refactor
2020-10-06 23:36:21 -03:00
5e298aac96
Merge pull request #549 from ArchieBeepBoop/moveforce
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-05 02:59:39 +01:00
b8bc551d51
Merge pull request #9601 from Ghommie/Ghommie-cit265
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
a00247c4b4
bird skull bird skull
2020-10-02 23:40:14 -07:00
ac25b449f7
Merge pull request #9856 from Ghommie/Ghommie-cit367
2020-10-02 00:49:56 -03:00
20c30a15d1
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
...
Ghost role eligibility activation in player panel
2020-10-01 23:13:20 -03:00
b433eab324
Merge pull request #10350 from Putnam3145
2020-10-01 23:04:52 -03:00
095d1352d2
Merge pull request #520 from Chemlight/Sizecode-to-items
...
Size up and down with a chemical and items.
2020-09-27 05:29:24 +01:00
Vladin