 kevinz000
|
8b27926fee
|
Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
|
2019-05-31 18:00:12 -07:00 |
|
|
kevinz000
|
2a5bbfdafc
|
Merge pull request #8482 from Ghommie/Ghommie-cit22
fixes pacifism eyestabbing, better this time.
|
2019-05-31 17:59:33 -07:00 |
|
|
kevinz000
|
140e065525
|
Merge pull request #8495 from BurgerLUA/Anti-Obese
Obesity is now a warning instead of a notice.
|
2019-05-31 17:59:09 -07:00 |
|
|
kevinz000
|
59e88e0808
|
Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
|
2019-05-31 17:58:48 -07:00 |
|
|
kevinz000
|
16c89da587
|
Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
|
2019-05-31 17:55:37 -07:00 |
|
|
kevinz000
|
7507831ffa
|
Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
|
2019-05-31 17:52:40 -07:00 |
|
|
kevinz000
|
c645d2129f
|
Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
|
2019-05-31 17:52:25 -07:00 |
|
|
kevinz000
|
4224606c5f
|
Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
|
2019-05-31 17:50:59 -07:00 |
|
|
kevinz000
|
61f9c2edcd
|
Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
|
2019-05-31 17:47:08 -07:00 |
|
|
kevinz000
|
14d763bd1d
|
Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
|
2019-05-31 17:46:44 -07:00 |
|
|
kevinz000
|
8c6d8eb20b
|
Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
|
2019-05-31 17:45:07 -07:00 |
|
|
kevinz000
|
07d3b0361c
|
Merge pull request #8466 from Poojawa/vis-overlay-insolence
Fixes atmos and station alert consoles not updating visually
|
2019-05-31 17:44:39 -07:00 |
|
|
kevinz000
|
854eb129f6
|
Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
|
2019-05-31 17:43:53 -07:00 |
|
|
kevinz000
|
1efdfd38e0
|
Merge pull request #8436 from Trilbyspaceclone/patch-137
Allows bio genes to make synth meat
|
2019-05-31 17:43:22 -07:00 |
|
|
kevinz000
|
f678741a0e
|
Merge pull request #8470 from Ghommie/Ghommie-cit19
Undunks pepper spray & teargas.
|
2019-05-31 17:42:28 -07:00 |
|
|
kevinz000
|
ca16cd9467
|
Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
|
2019-05-31 17:41:39 -07:00 |
|
|
kevinz000
|
a96e414d2f
|
Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
|
2019-05-31 17:40:30 -07:00 |
|
|
Trilbyspaceclone
|
9badda96d8
|
huh
|
2019-05-31 18:04:02 -04:00 |
|
|
Trilbyspaceclone
|
5e67974611
|
old file fixing
|
2019-05-31 18:01:22 -04:00 |
|
|
Trilbyspaceclone
|
aaaebe625b
|
old file fixes
|
2019-05-31 18:00:00 -04:00 |
|
|
Trilbyspaceclone
|
3891cf1ff6
|
Update sheet_types.dm
|
2019-05-31 17:54:49 -04:00 |
|
|
Trilbyspaceclone
|
96a32f7c3d
|
Update boxes.dm
|
2019-05-31 17:53:54 -04:00 |
|
|
Trilbyspaceclone
|
ddfe9812a1
|
Update shotgun.dm
|
2019-05-31 16:06:26 -04:00 |
|
|
BurgerLua
|
5dc3542f90
|
added
|
2019-05-30 15:49:53 -07:00 |
|
|
Trilbyspaceclone
|
c73884aea4
|
huh...
|
2019-05-30 16:12:40 -04:00 |
|
|
Trilbyspaceclone
|
751b9adb53
|
Update recipes.dm
|
2019-05-30 16:10:10 -04:00 |
|
|
Trilbyspaceclone
|
5d80fb6811
|
Update backpack.dm
|
2019-05-30 15:04:45 -04:00 |
|
|
Ghommie
|
fa4cf533cb
|
honestly AP bullet spam is ballocks too.
|
2019-05-30 20:20:05 +02:00 |
|
|
kevinz000
|
f5b3484e92
|
Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
|
2019-05-30 11:12:35 -07:00 |
|
|
Ghommie
|
85ab988842
|
0, null, and "", all fulfill the ! operator.
|
2019-05-30 20:09:19 +02:00 |
|
|
Trilbyspaceclone
|
a8ec60d9c1
|
Update miscellaneous.dm
|
2019-05-30 13:51:55 -04:00 |
|
|
kevinz000
|
e75e629a8a
|
Update code/modules/antagonists/changeling/powers/adrenaline.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-05-30 10:32:02 -07:00 |
|
|
SkullyRoberts
|
5482469a86
|
Added lightup shoes and heelys to maint loot
|
2019-05-30 13:02:18 -04:00 |
|
|
Coolgat3
|
674e8a4227
|
Glubbs
|
2019-05-30 18:59:43 +02:00 |
|
|
Trilbyspaceclone
|
39700503f9
|
Update miscellaneous.dm
|
2019-05-30 11:40:37 -04:00 |
|
|
Trilbyspaceclone
|
618c2c070c
|
Update ert.dm
|
2019-05-30 11:36:20 -04:00 |
|
|
Trilbyspaceclone
|
0eb468e3a5
|
Update ert.dm
|
2019-05-30 11:33:38 -04:00 |
|
|
Trilbyspaceclone
|
a6e85a63ba
|
Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
|
2019-05-30 11:14:31 -04:00 |
|
|
BlackMajor
|
0d06605662
|
Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
|
2019-05-30 16:17:33 +12:00 |
|
|
Useroth
|
d8d9d6efeb
|
Tweaks. Also, eating human pies makes them chestburst you a'la monkey cubes.
|
2019-05-29 23:45:25 +02:00 |
|
|
Trilbyspaceclone
|
027ee1e596
|
Update plushes.dm
|
2019-05-29 16:40:41 -04:00 |
|
|
Ghommie
|
8fbc25ad77
|
Ports in combat gloves plus.
|
2019-05-29 16:35:56 +02:00 |
|
|
Ghommie
|
bcf1072399
|
fixes eyestabbing, better this time.
|
2019-05-29 10:08:00 +02:00 |
|
|
Useroth
|
16826eba66
|
Tweaks n' stuff.
|
2019-05-29 08:45:21 +02:00 |
|
|
deathride58
|
3feb11f12a
|
Ports the zulie cloak and blackredgold coat donor items from RP
|
2019-05-28 19:38:08 -04:00 |
|
|
Trilbyspaceclone
|
5ead987d53
|
Update hierophant.dm
|
2019-05-28 19:01:32 -04:00 |
|
|
Trilbyspaceclone
|
69a39b4f67
|
Update hierophant.dm
|
2019-05-28 18:56:16 -04:00 |
|
|
kevinz000
|
8cd0b69b61
|
adrenals
|
2019-05-28 01:00:41 -07:00 |
|
|
Useroth
|
848f3910e6
|
Oops. Now it compiles fine.
|
2019-05-28 09:32:59 +02:00 |
|
|
Useroth
|
eb6e710b18
|
Forgot to uncomment the clown check on the shoes.
|
2019-05-28 09:17:03 +02:00 |
|