 Putnam3145
|
beddaa1a99
|
Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
|
2019-12-09 12:40:37 -08:00 |
|
|
Ghommie
|
723690bab0
|
Demodularize defib disks and projectiles icons.
|
2019-12-06 23:07:50 +01:00 |
|
|
kevinz000
|
b8bb0f2924
|
Merge pull request #10048 from Ghommie/Ghommie-cit426
Demodularize moodlets.
|
2019-12-05 21:56:29 -07:00 |
|
|
kevinz000
|
d217a9f445
|
Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
|
2019-12-05 21:33:12 -07:00 |
|
|
Ghommie
|
238655d599
|
Fixes eyes blindness a little.
|
2019-12-06 00:10:50 +01:00 |
|
|
Seris02
|
0c5a1b900b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
|
2019-12-05 21:09:38 +08:00 |
|
|
Ghommie
|
77ef3dabea
|
Demodularize moodlets.
|
2019-12-04 23:10:39 +01:00 |
|
|
Ghommie
|
3c7d2972de
|
Porting some return type annotations and bad keyword fixes, linter stuff.
|
2019-12-03 03:31:35 +01:00 |
|
|
Lin
|
99e9c7299e
|
Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
|
2019-12-03 01:30:51 +00:00 |
|
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|
|
Putnam3145
|
8da17c5aaf
|
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
|
2019-12-01 23:12:35 -08:00 |
|
|
Putnam3145
|
1d91e1acf4
|
Merge pull request #10016 from deathride58/mousedropfixes
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
|
2019-11-30 22:51:42 -08:00 |
|
|
Putnam3145
|
fde3f52212
|
Merge pull request #10005 from Commandersand/loadoutcit
Adds plaid skirt, pens, stripper outfits,athletic shorts to loadout. also keyhole sweater
|
2019-11-30 22:36:27 -08:00 |
|
|
Putnam3145
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
|
Seris02
|
9afbabb55e
|
removes cult coat for now, adds coats to places
|
2019-12-01 05:42:43 +08:00 |
|
|
deathride58
|
b1fca2b74b
|
Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it
|
2019-11-29 22:59:37 -05:00 |
|
|
loginsandylogout
|
67754daf22
|
Fixed
|
2019-11-29 10:57:51 -06:00 |
|
|
loginsandylogout
|
7ddaaea267
|
Cats
|
2019-11-29 10:56:18 -06:00 |
|
|
loginsandylogout
|
88bd7678b1
|
Eee
|
2019-11-29 10:55:00 -06:00 |
|
|
loginsandylogout
|
a608003555
|
Equals
|
2019-11-29 10:53:57 -06:00 |
|
|
Putnam3145
|
ad53b10faa
|
Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
|
2019-11-29 06:20:18 -08:00 |
|
|
loginsandylogout
|
c8bc6941eb
|
"don't copy paste code"
|
2019-11-29 02:46:31 -06:00 |
|
|
loginsandylogout
|
0da35fdde5
|
again
|
2019-11-29 02:33:33 -06:00 |
|
|
loginsandylogout
|
f9d8c41c3e
|
newline needed apparently
|
2019-11-29 02:32:47 -06:00 |
|
|
Commandersand
|
2c2f3ea8aa
|
mandatory meme
|
2019-11-29 02:03:31 -06:00 |
|
|
Commandersand
|
60cee5814a
|
keyholesweater
|
2019-11-29 01:59:34 -06:00 |
|
|
Commandersand
|
22d0dbc05b
|
sundress and stripper
|
2019-11-29 01:56:47 -06:00 |
|
|
Commandersand
|
5b7bf08d10
|
sundress
|
2019-11-29 01:47:41 -06:00 |
|
|
Commandersand
|
b715c088f6
|
add athletic shorts to loadout
|
2019-11-29 01:27:15 -06:00 |
|
|
Commandersand
|
57af7ba8af
|
add plaid skirt,multipen,fountainpen to loadout
|
2019-11-29 01:24:24 -06:00 |
|
|
Ghommie
|
9b8ed8ca4f
|
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
|
2019-11-29 07:14:51 +01:00 |
|
|
kevinz000
|
bcfa9c6c4d
|
Merge pull request #9956 from Linzolle/duke-beret
Donator item fix
|
2019-11-28 23:12:35 -07:00 |
|
|
kevinz000
|
7495ce602a
|
Merge pull request #9693 from Ghommie/Ghommie-cit310
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
|
2019-11-28 23:03:07 -07:00 |
|
|
GrayRachnid
|
de43339d56
|
made it actually compile
|
2019-11-27 16:42:28 -05:00 |
|
|
GrayRachnid
|
47e3cd346f
|
Fixes codewords and MKUltra enthrall hearing.
|
2019-11-27 16:36:19 -05:00 |
|
|
Ghommie
|
a5298dac7e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
|
2019-11-27 21:44:56 +01:00 |
|
|
Ghommie
|
d43d996c38
|
ouch
|
2019-11-27 06:19:17 +01:00 |
|
|
Ghommie
|
c67f138d23
|
patching some combat mode edge cases and issues.
|
2019-11-27 06:10:08 +01:00 |
|
|
Linzolle
|
cc5d54fe24
|
fix
|
2019-11-26 20:36:45 -06:00 |
|
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
|
kevinz000
|
2bb1e93d05
|
Update human_movement.dm
|
2019-11-25 22:53:56 -07:00 |
|
|
Winter Flare
|
e7523862eb
|
Added Newspaperr to Loadout
|
2019-11-25 06:02:50 -05:00 |
|
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
|
BlackMajor
|
47b5dbeaaa
|
Merge pull request #9625 from Ghommie/Ghommie-cit277
Unmodularize digi/muzzled clothing sprites.
|
2019-11-25 11:30:31 +13:00 |
|
|
Fermi
|
99e9c606c0
|
I dunno what I did but it's fixed... somehow.
|
2019-11-24 04:03:51 +00:00 |
|
|
Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
|
Fermi
|
25fe5ec14b
|
Revert "Revert "Alright""
This reverts commit 505e15a3e1.
|
2019-11-24 03:04:37 +00:00 |
|
|
Fermi
|
1df097b8ed
|
Revert "Revert "hark""
This reverts commit f4b54f15d2.
|
2019-11-24 03:04:31 +00:00 |
|