kevinz000
|
eb1c767ab7
|
Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
|
2019-06-08 01:24:36 -07:00 |
|
kevinz000
|
ae5d4de111
|
Merge pull request #8552 from Ghommie/Ghommie-cit31
Ports "Fixes goonchat cookies not saving properly."
|
2019-06-08 01:24:16 -07:00 |
|
kevinz000
|
95abaf6a6e
|
Merge pull request #8551 from Ghommie/Ghommie-cit30
Port paradise goonchat uridecode fix
|
2019-06-08 01:23:59 -07:00 |
|
kevinz000
|
4050ba98eb
|
Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
|
2019-06-08 01:23:31 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
88990f5ae0
|
Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
|
2019-06-08 01:21:41 -07:00 |
|
kevinz000
|
a37bf5bfaf
|
Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
|
2019-06-08 01:21:28 -07:00 |
|
kevinz000
|
2b3af1672c
|
Merge branch 'master' into patch-135
|
2019-06-08 01:19:37 -07:00 |
|
kevinz000
|
9edac9fc6c
|
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
|
2019-06-08 01:17:04 -07:00 |
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07:00 |
|
kevinz000
|
e518d6e4b1
|
Merge pull request #8490 from SkullyRoberts/Heelys
Added toggle-able rainbow lightup shoes and functional heelys to maint loot
|
2019-06-08 01:12:57 -07:00 |
|
kevinz000
|
f458828659
|
Merge pull request #8503 from Trilbyspaceclone/patch-159
Changing up the drills/picks/jackhammer a bit
|
2019-06-08 01:10:34 -07:00 |
|
kevinz000
|
80aa303b4e
|
Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
|
2019-06-08 01:10:11 -07:00 |
|
kevinz000
|
f201bd1508
|
Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
|
2019-06-08 01:09:26 -07:00 |
|
kevinz000
|
487461fbda
|
Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
|
2019-06-08 01:09:00 -07:00 |
|
kevinz000
|
c8435a5658
|
Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
|
2019-06-08 01:08:00 -07:00 |
|
kevinz000
|
3b24e05dd6
|
Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
|
2019-06-08 01:07:18 -07:00 |
|
kevinz000
|
61d0ac9993
|
Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
|
2019-06-08 01:05:28 -07:00 |
|
kevinz000
|
7875ca73be
|
Merge pull request #8444 from dtfe3/patch-1
CWC player requirement increase
|
2019-06-08 01:03:37 -07:00 |
|
kevinz000
|
68ef76e09a
|
Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
|
2019-06-08 01:03:01 -07:00 |
|
kevinz000
|
c7f346a03c
|
Merge pull request #8442 from Trilbyspaceclone/patch-139
Makes soviet clothing no longer need to be hacked AND emaged
|
2019-06-08 01:02:21 -07:00 |
|
kevinz000
|
8c632bed6f
|
Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
|
2019-06-08 01:00:41 -07:00 |
|
deathride58
|
1dde6b90ae
|
Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
|
2019-06-08 01:37:29 -04:00 |
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01:00 |
|
deathride58
|
3051994c0e
|
Merge pull request #8546 from Sishen1542/Plushies
Crew Plushies! Redtail, Annie, Paxton, Mason.
|
2019-06-08 01:10:25 -04:00 |
|
deathride58
|
7fcb46e0f6
|
Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
|
2019-06-08 01:09:52 -04:00 |
|
deathride58
|
8bf5777844
|
Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
|
2019-06-08 01:07:56 -04:00 |
|
Fermi
|
3bb1a8dd00
|
OOPS.
|
2019-06-08 02:19:39 +01:00 |
|
Fermi
|
b6788cdd64
|
Updated projectile sprite.
|
2019-06-08 01:45:32 +01:00 |
|
Fermi
|
26e55a7a42
|
Swapped stacking to FALSE
|
2019-06-08 01:40:13 +01:00 |
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
Fermi
|
9fcbac0323
|
Lil flavour.
|
2019-06-08 01:23:57 +01:00 |
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01:00 |
|
Fermi
|
f44b9048af
|
Added to vendors/tech.
|
2019-06-08 01:00:51 +01:00 |
|
Fermi
|
65b218d4c3
|
Spritework.
|
2019-06-08 00:31:14 +01:00 |
|
Trilbyspaceclone
|
022b648979
|
Update granters.dm
|
2019-06-07 18:35:52 -04:00 |
|
Trilbyspaceclone
|
bc6b967fb2
|
Update paperplane.dm
|
2019-06-07 18:34:30 -04:00 |
|
Trilbyspaceclone
|
79a456a0ac
|
Update carbon_defense.dm
|
2019-06-07 18:29:42 -04:00 |
|
Arturlang
|
39775a08ac
|
Update RPD.dm
|
2019-06-07 19:56:31 +03:00 |
|
SkullyRoberts
|
5a9269db73
|
removed duplicate hides_bulges
|
2019-06-07 12:56:25 -04:00 |
|
SkullyRoberts
|
1a5c487e22
|
Ported the nudity permit from RP and made it a loadout option
|
2019-06-07 12:37:37 -04:00 |
|
Sishen
|
b467d144ef
|
pridebois
|
2019-06-07 05:53:07 -04:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
AnalWerewolf
|
4ff12eebd0
|
he bork and he woof
|
2019-06-07 18:10:22 +10:00 |
|
Ghommie
|
56be73f7e0
|
Lord Travis Hath Spoken.
|
2019-06-07 07:44:33 +02:00 |
|
Ghommie
|
92e925f1f7
|
Stuff to fix, fools to blame.
|
2019-06-07 07:14:24 +02:00 |
|
Ghommie
|
b6f35435ec
|
Ports the get_area conversion to define.
|
2019-06-07 06:50:26 +02:00 |
|
Ghommie
|
4d5332346e
|
Compiling was too slow.
|
2019-06-07 06:37:03 +02:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Poojawa
|
38dbdf1a48
|
Gives Ninjas back their Weeb speech modification
|
2019-06-06 21:55:35 -05:00 |
|