 spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
kevinz000
|
d44d5168d8
|
progress..
|
2020-04-10 22:50:53 -07:00 |
|
|
Akrilla
|
8abc0cc0a7
|
!on
|
2020-04-11 05:24:24 +01:00 |
|
|
Ghom
|
cd2edb3cf1
|
dont need to null when qdeling later (#11797)
|
2020-04-11 01:59:46 +02:00 |
|
|
Ghom
|
a75bd30911
|
Update carbon_defense.dm
|
2020-04-10 19:54:12 +02:00 |
|
|
Artur
|
f481be1496
|
Makin stuff nice and dandy
|
2020-04-10 20:53:28 +03:00 |
|
|
Putnam3145
|
b939359e35
|
Made my choice thing actually... do something (#11787)
|
2020-04-10 18:16:19 +02:00 |
|
|
kevinz000
|
d5769a6ee4
|
Update carbon_defense.dm (#11738)
|
2020-04-10 18:13:50 +02:00 |
|
|
Ghommie
|
af55880794
|
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-10 17:22:34 +02:00 |
|
|
Arturlang
|
b40fb55539
|
Fixes mesmerzie and makes it work better (#11785)
* Weh
* Mesmerize works a lot nicer now
|
2020-04-10 15:41:35 +02:00 |
|
|
kevinz000
|
d19dd8f2e1
|
fixes baystruments (#11790)
* fix
* sigh
|
2020-04-10 15:36:42 +02:00 |
|
|
kevinz000
|
185b38e109
|
Update scooter.dm
|
2020-04-10 04:33:35 -07:00 |
|
|
kevinz000
|
9d931c0a3a
|
Update datum_pipeline.dm
|
2020-04-10 04:32:16 -07:00 |
|
|
kevinz000
|
b09ac26ab2
|
Update scooter.dm
|
2020-04-10 04:25:53 -07:00 |
|
|
Akrilla
|
2a05903808
|
do_after
|
2020-04-10 04:26:35 +01:00 |
|
|
Akrilla
|
5c74e239a0
|
wew
|
2020-04-10 03:43:18 +01:00 |
|
|
Timothy Teakettle
|
ea8d43281e
|
swap & for &&
woops
Co-Authored-By: Lin <linzolle@gmail.com>
|
2020-04-10 03:21:06 +01:00 |
|
|
Akrilla
|
ec5db05bdc
|
fixes up readapting
|
2020-04-10 03:18:13 +01:00 |
|
|
ForrestWick
|
0a54f8a7a0
|
I'M SORRY MR GITHUB PLS DONT BEAT ME
|
2020-04-09 17:27:18 -05:00 |
|
|
Timothy Teakettle
|
4c4e110375
|
imagine making it compile
|
2020-04-09 20:16:55 +01:00 |
|
|
Timothy Teakettle
|
951732c361
|
make secret sauce work on customizables
|
2020-04-09 20:12:02 +01:00 |
|
|
Timothy Teakettle
|
1ffea14ee8
|
makes descriptions work
|
2020-04-09 19:53:14 +01:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
Akrilla
|
87dce0c3e9
|
dont need to null when qdeling later
|
2020-04-09 18:41:39 +01:00 |
|
|
Timothy Teakettle
|
cfec83b8a2
|
what if butchering didnt suck!
|
2020-04-09 18:38:29 +01:00 |
|
|
Trilbyspaceclone
|
9bf84aca32
|
grammar
|
2020-04-09 13:18:55 -04:00 |
|
|
Putnam3145
|
a203ef7de5
|
Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1
DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
|
2020-04-09 10:07:25 -07:00 |
|
|
Arturlang
|
f80900fd0b
|
Fixes vendors not eating coins (#11795)
|
2020-04-09 19:07:11 +02:00 |
|
|
kevinz000
|
0cd7437f49
|
Update status_procs.dm
|
2020-04-09 09:33:21 -07:00 |
|
|
Timothy Teakettle
|
7fe5bb71d7
|
more quality
|
2020-04-09 16:07:45 +01:00 |
|
|
Timothy Teakettle
|
47be942c92
|
more quality
|
2020-04-09 15:29:10 +01:00 |
|
|
kevinz000
|
bfad661c1c
|
Merge pull request #11737 from Trilbyspaceclone/patch-330
Buffs Stimpacks
|
2020-04-09 06:57:13 -07:00 |
|
|
Timothy Teakettle
|
97dcb9ed84
|
fried garbage is now better
|
2020-04-09 14:50:11 +01:00 |
|
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
|
Ghommie
|
d2b624a908
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
|
2020-04-09 14:59:40 +02:00 |
|
|
Putnam3145
|
5078b5875a
|
Fixes my oldish badcode. (#11781)
|
2020-04-09 14:48:58 +02:00 |
|
|
Timothy Teakettle
|
7fba81f36e
|
people are more picky about food
|
2020-04-09 13:32:02 +01:00 |
|
|
kevinz000
|
7cb2057bb0
|
Merge pull request #11751 from Arturlang/kills_the_shitty_fix
TGUI Next vendors plus spritesheet port from TG
|
2020-04-09 03:53:08 -07:00 |
|
|
kevinz000
|
f60cf32562
|
Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
|
2020-04-09 02:41:01 -07:00 |
|
|
kevinz000
|
22bf4cdb83
|
Merge pull request #11760 from Trilbyspaceclone/10mmchanges
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
|
2020-04-09 02:38:44 -07:00 |
|
|
kevinz000
|
956a85ab34
|
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
|
2020-04-09 02:09:51 -07:00 |
|
|
kevinz000
|
9208c42747
|
Merge pull request #11722 from timothyteakettle/bye-separated-chems
goodbye separated chemicals
|
2020-04-09 02:02:55 -07:00 |
|
|
Putnam3145
|
474d6a486d
|
Merge pull request #11773 from Arturlang/cablefix
Fixes cablecuff making producing 0 amount cables
|
2020-04-09 01:28:30 -07:00 |
|
|
Artur
|
0a234d5618
|
TABS NOT SPACES
AAAAAAAA
|
2020-04-09 09:32:23 +03:00 |
|
|
timothyteakettle
|
d985ea8c84
|
more quality
|
2020-04-09 02:51:32 +01:00 |
|
|
timothyteakettle
|
20d4172030
|
more quality
|
2020-04-09 02:10:00 +01:00 |
|
|
timothyteakettle
|
a90f3d9d2b
|
woops
|
2020-04-09 01:46:47 +01:00 |
|
|
timothyteakettle
|
792be6e146
|
more food quality
|
2020-04-09 01:36:15 +01:00 |
|
|
timothyteakettle
|
bc6294baa9
|
i too, like food quality.
|
2020-04-09 01:10:34 +01:00 |
|
|
Artur
|
75a2dd6900
|
Finnishing touches, hopefully
Tweaks some indendation
|
2020-04-08 18:32:45 +03:00 |
|