 r4d6
|
383e09651f
|
Suggestions
|
2019-12-21 14:55:37 -05:00 |
|
|
Ghommie
|
8c5e506a17
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382
|
2019-12-21 18:22:58 +01:00 |
|
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
|
Ghom
|
ce34bcf2e4
|
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
|
2019-12-21 14:34:43 +01:00 |
|
|
Ghom
|
7f0ae5dbde
|
I gotta go fast.
|
2019-12-21 13:04:27 +01:00 |
|
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
|
Ghom
|
9a38612ec4
|
Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
|
2019-12-20 16:27:47 +01:00 |
|
|
Seris02
|
61ab3685f1
|
atmos firelock, changes to temp blocking
|
2019-12-20 14:14:01 +08:00 |
|
|
r4d6
|
61a702bad5
|
Merge remote-tracking branch 'upstream/master' into substationV2
|
2019-12-19 23:51:14 -05:00 |
|
|
r4d6
|
dbf3e7d246
|
Add the landmarks
|
2019-12-19 15:27:45 -05:00 |
|
|
nik707
|
63dd3487b3
|
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
|
2019-12-19 14:11:27 -06:00 |
|
|
kevinz000
|
8aca8b8f25
|
thank you based ghomtainer (when) 2x how did i not notice this
|
2019-12-19 04:00:37 -07:00 |
|
|
kevinz000
|
9436d218b4
|
thank you based ghomtainer (when)
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-19 03:59:57 -07:00 |
|
|
kevinz000
|
eee52655ef
|
Update flashbang.dm
|
2019-12-19 01:57:28 -07:00 |
|
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|
|
Ghommie
|
ba851d55b6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
|
2019-12-18 19:42:41 +01:00 |
|
|
Seris02
|
6df739a045
|
changes holofan, adds holofirelock
|
2019-12-19 00:39:29 +08:00 |
|
|
kevinz000
|
e3844ee1f9
|
wups
|
2019-12-17 21:05:21 -07:00 |
|
|
kevinz000
|
5a2ef22633
|
buckle others
|
2019-12-17 21:03:37 -07:00 |
|
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
|
Trilbyspaceclone
|
ddd3676903
|
Merge branch 'master' into glassware
|
2019-12-17 15:18:30 -05:00 |
|
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
|
Putnam3145
|
7017ab243b
|
Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
|
2019-12-17 11:47:19 -08:00 |
|
|
Putnam3145
|
0adcb900c1
|
Merge pull request #10155 from Seris02/windowfix
adds some distance checks to some things
|
2019-12-17 11:34:13 -08:00 |
|
|
Putnam3145
|
670141edf7
|
Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-17 11:26:36 -08:00 |
|
|
BlackMajor
|
95c0eddc2a
|
Merge pull request #10072 from Useroth/new-tg-plants
Ported bamboo stuff from tg.
|
2019-12-18 01:02:29 +13:00 |
|
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
|
Ghommie
|
5bf252a58c
|
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2019-12-17 01:57:56 +01:00 |
|
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
|
kevinz000
|
1701811fb6
|
kay
|
2019-12-16 11:35:04 -07:00 |
|
|
Ghommie
|
447f416ca6
|
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
|
2019-12-16 19:10:07 +01:00 |
|
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
|
kevinz000
|
b3ad352a96
|
stuff
|
2019-12-16 08:10:41 -07:00 |
|
|
BlackMajor
|
74cc1ec547
|
Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
|
2019-12-16 14:14:35 +13:00 |
|
|
loginsandylogout
|
491958475b
|
fixed
|
2019-12-15 18:48:50 -06:00 |
|
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
|
Putnam3145
|
b7d082a204
|
Merge pull request #10144 from Linzolle/sabre-noise
makes the officer's sabre play the un/sheating noise properly
|
2019-12-15 12:08:46 -08:00 |
|
|
BlackMajor
|
c6732bb516
|
typo lol
|
2019-12-16 01:28:34 +13:00 |
|
|
BlackMajor
|
4b177c4956
|
Adjusted NF balance
|
2019-12-16 01:20:14 +13:00 |
|
|
kevinz000
|
586dcb6f81
|
welp i got lazy
|
2019-12-15 00:15:32 -07:00 |
|
|
kevinz000
|
4970675467
|
s
|
2019-12-15 00:06:11 -07:00 |
|
|
Lin
|
2e003b7383
|
Merge pull request #10050 from Ghommie/Ghommie-cit427
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
|
2019-12-14 05:33:31 +00:00 |
|
|
BlackMajor
|
59d0376985
|
finished
|
2019-12-14 17:31:26 +13:00 |
|
|
Hatterhat
|
a1cc129d0b
|
slightly better storage, cucks the surgery duffel
|
2019-12-13 21:10:12 -06:00 |
|
|
kevinz000
|
659b78d8b8
|
Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
|
2019-12-13 16:52:22 -07:00 |
|
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
|
nik707
|
cdeb4733aa
|
Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
|
2019-12-12 23:50:34 -06:00 |
|
|
Ghommie
|
c098d497ad
|
Minor underwear fixes and tweaks.
|
2019-12-13 06:50:14 +01:00 |
|
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|