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 |
|
Ghommie
|
a055f12394
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-06-16 12:41:06 +02: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
|
4da303e64c
|
Update RCD.dm
|
2019-06-16 02:26:53 -07:00 |
|
Ghommie
|
ba3a2c00bb
|
ports in the Hilbert's Hotel.
|
2019-06-16 10:50:59 +02: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 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Thalpy
|
ad8c1593f6
|
Reduced medical jargon on scanners.
|
2019-06-13 01:47:29 +01: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 |
|
Poojawa
|
7738c97b80
|
NYEH. fuckin' memes
|
2019-06-12 04:33:14 -05:00 |
|
Poojawa
|
a05d51be3f
|
god I can't believe I'm matrixing gib overlays. save me PLEASE
|
2019-06-11 19:43:08 -05:00 |
|
unknown
|
80eb813a07
|
RD can now suplex a rod. Good fucking luck.
|
2019-06-11 18:53:17 +03:00 |
|
Poojawa
|
26855d0698
|
Gibs spawn correctly. Just need to figure out the overlays now
|
2019-06-11 04:33:38 -05:00 |
|
TrilbySpaseClone
|
3cebb1e807
|
Worked?
Yay?
|
2019-06-10 22:59:36 -04:00 |
|
Useroth
|
18c31ef22b
|
Fixed the rapier sprites.
|
2019-06-11 00:39:56 +02:00 |
|
Trilbyspaceclone
|
9cb3da57b2
|
Impaled
|
2019-06-10 17:33:49 -04:00 |
|
Trilbyspaceclone
|
cc2240366e
|
Update belt.dm
|
2019-06-10 17:33:08 -04:00 |
|
Trilbyspaceclone
|
8cc0ca14cb
|
Update misc.dm
|
2019-06-10 17:11:39 -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 |
|
Ghommie
|
b4ccfe078a
|
snap
|
2019-06-10 00:35:57 +02:00 |
|
Ghommie
|
79c4ce502e
|
more pda skins.
|
2019-06-10 00:28:43 +02:00 |
|
Ghommie
|
cce9c87af7
|
shower ideas.
|
2019-06-09 20:46:37 +02:00 |
|
Ghommie
|
88ab1794a6
|
lazylen
|
2019-06-09 20:00:54 +02:00 |
|
Ghommie
|
d2e216f2de
|
tested fixed tested fixed tested.
|
2019-06-09 19:55:08 +02:00 |
|
Poojawa
|
69cefb604b
|
just need to fine tweak gibs and we're gucci
|
2019-06-09 11:10:23 -05: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 |
|