deathride58
|
b487b0103b
|
Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
|
2019-06-16 22:52:47 -04:00 |
|
deathride58
|
7b329ae824
|
Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
|
2019-06-16 22:51:03 -04:00 |
|
kevinz000
|
28ca8dee46
|
Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
|
2019-06-16 19:47:09 -07:00 |
|
kevinz000
|
78c969a9cb
|
Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
|
2019-06-16 19:43:10 -07:00 |
|
kevinz000
|
27d7dc430f
|
Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
|
2019-06-16 19:41:57 -07:00 |
|
kevinz000
|
27333276de
|
Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
|
2019-06-16 19:40:01 -07:00 |
|
kevinz000
|
1739ee1685
|
Merge pull request #8578 from Ghommie/Ghommie-cit41
Clears up Extinguisher's slippery instructions.
|
2019-06-16 19:38:23 -07:00 |
|
kevinz000
|
1a6450a2e2
|
Merge pull request #8416 from Trilbyspaceclone/patch-135
Gives sec EVA suits storge some Sec Jetpacks
|
2019-06-16 19:35:05 -07:00 |
|
kevinz000
|
6c560c566f
|
Merge pull request #8579 from Trilbyspaceclone/patch-171
Gives gangs a new shield and makes their boots cheaper
|
2019-06-16 19:32:38 -07:00 |
|
kevinz000
|
9e85eb5757
|
Merge pull request #8618 from Trilbyspaceclone/Magless
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
|
2019-06-16 19:29:04 -07:00 |
|
Trilbyspaceclone
|
5716ea7a4b
|
Update shields.dm
|
2019-06-16 10:22:07 -04:00 |
|
kevinz000
|
89dd3d4e87
|
Merge pull request #8657 from BlackMajor/Dunga
HAHA WHOOPS I ACCIDENTALLY NUKED IT
|
2019-06-16 03:11:26 -07:00 |
|
BlackMajor
|
979455d86a
|
HAHA WHOOPS
|
2019-06-16 22:10:00 +12:00 |
|
kevinz000
|
b0264414b2
|
Merge pull request #8576 from Sishen1542/whipcrack
Whips are long again (except yours, curator)
|
2019-06-16 01:18:37 -07:00 |
|
kevinz000
|
1408a453de
|
Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
|
2019-06-16 01:16:12 -07:00 |
|
kevinz000
|
12ecaf63ee
|
Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
|
2019-06-16 01:11:11 -07:00 |
|
kevinz000
|
8e10286fd6
|
Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
|
2019-06-16 01:10:25 -07:00 |
|
kevinz000
|
c6bdb74c6a
|
Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX
RD can now suplex a immovable rod.
|
2019-06-16 01:08:48 -07:00 |
|
BlackMajor
|
5c99bbbd45
|
Undoing first step into scaling damage for fullmerge reasons
|
2019-06-16 20:00:31 +12:00 |
|
Trilbyspaceclone
|
c0d3ddceeb
|
Update uplink_kits.dm
|
2019-06-15 22:59:24 -04:00 |
|
Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
Ghommie
|
e2bf5b73fd
|
I'm being too careless, sorry for the many commits.
|
2019-06-12 23:22:31 +02:00 |
|
Ghommie
|
7a8eaf41ac
|
another get_cell()
|
2019-06-12 23:21:42 +02:00 |
|
Ghommie
|
5ba46eb517
|
Avoid runtiming.
|
2019-06-12 23:20:34 +02:00 |
|
Ghommie
|
2edef99b08
|
.
|
2019-06-12 23:16:27 +02:00 |
|
Ghommie
|
a29095cbe1
|
Penitence for the awful mistakes I have done in the refactor.
|
2019-06-12 23:06:09 +02:00 |
|
Ghommie
|
5a35e95735
|
.
|
2019-06-12 22:52:05 +02:00 |
|
Ghommie
|
4cc7636da1
|
fixing more.
|
2019-06-12 22:50:09 +02:00 |
|
Ghommie
|
368267f53d
|
dddddd
|
2019-06-12 20:31:24 +02:00 |
|
Ghommie
|
516b71ed7e
|
fixing stunbatons.
|
2019-06-12 20:13:08 +02:00 |
|
unknown
|
80eb813a07
|
RD can now suplex a rod. Good fucking luck.
|
2019-06-11 18:53:17 +03:00 |
|
TrilbySpaseClone
|
3cebb1e807
|
Worked?
Yay?
|
2019-06-10 22:59:36 -04:00 |
|
Sishen
|
13853ac6bf
|
removes family gavel, readds briefcase
|
2019-06-10 10:16:32 -04:00 |
|
Sishen
|
400ad0b03b
|
added family gavel
|
2019-06-10 09:55:23 -04:00 |
|
kevinz000
|
8ba3609a4d
|
god why fuck
|
2019-06-10 00:07:04 -07:00 |
|
AnalWerewolf
|
8337692650
|
Merge branch 'master' into Fritz-cute
|
2019-06-10 15:15:41 +10:00 |
|
Trilbyspaceclone
|
e6e5e62db2
|
Update briefcase.dm
|
2019-06-09 11:50:47 -04:00 |
|
Ghommie
|
c3fa360270
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43
|
2019-06-09 04:50:10 +02:00 |
|
Ghommie
|
7706ec6329
|
I LOVE THE SMELL OF NAPALM IN THE MORNING!
|
2019-06-09 02:45:14 +02:00 |
|
Trilbyspaceclone
|
60e89a6ca4
|
wrong w_class
|
2019-06-08 16:19:16 -04:00 |
|
Trilbyspaceclone
|
a86d6fd9cc
|
Update firstaid.dm
|
2019-06-08 16:06:36 -04:00 |
|
kevinz000
|
543c9c07e2
|
Merge pull request #8567 from Arturlang/RPD-Update
You can now use an RPD on windows and Grilles.
|
2019-06-08 12:05:26 -07:00 |
|
Trilbyspaceclone
|
b8ddbb5008
|
Update shields.dm
|
2019-06-08 11:21:40 -04:00 |
|
Ghommie
|
9464e8f55a
|
Clears up Extinguisher's slippery instructions.
|
2019-06-08 15:24:30 +02:00 |
|
Sishen
|
40030c40bf
|
lmao2reach
|
2019-06-08 07:19:11 -04:00 |
|
kevinz000
|
b69986e544
|
Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
|
2019-06-08 03:53:13 -07:00 |
|
kevinz000
|
2cda2380f6
|
durasteel toolboxes
|
2019-06-08 03:50:22 -07:00 |
|
kevinz000
|
50cee124c5
|
Merge pull request #8563 from Sishen1542/Prideful
Pride-struck Hammer in hands/on back
|
2019-06-08 03:00:05 -07:00 |
|
kevinz000
|
658f14275b
|
Merge pull request #8559 from Ghommie/Ghommie-cit36
Ports in the get_area conversion to define.
|
2019-06-08 01:26:45 -07:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|