SandPoot
b36da8f5d7
Revert "Revert "[DNM] Updates firemanning, throwing stuff""
...
This reverts commit def4b38a46 .
2023-10-12 14:34:02 -03:00
BlueWildrose
def4b38a46
Revert "[DNM] Updates firemanning, throwing stuff"
2023-10-11 13:52:03 -06:00
SandPoot
5a90dabd3c
stuff
2023-10-03 23:22:57 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
keronshb
e5f66413c8
fat dart
...
no idea what this even is
2021-10-08 17:28:25 -04:00
timothyteakettle
65c40a51f2
trash ELEMENT
2021-07-14 17:17:44 +01:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
Artur
3737c52df8
Funny actions
2021-01-20 15:23:34 +02:00
Ghommie
e3b1ca4942
Linter.
2020-07-03 19:57:38 +02:00
Lin
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Ghom
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
kevinz000
f326c06324
fixEs
2020-05-27 21:07:07 -07:00
Ghommie
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
Artur
5fbe05f3c9
Cleaning up and finishing up
2020-04-08 18:16:10 +03:00
Artur
c402c6dc30
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
2020-04-06 13:24:52 +03:00
Artur
7da4ad5694
Damned title doesnt want to show up
2020-04-03 10:29:07 +03:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghommie
0703c6eea6
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
kevinz000
fc684da88d
more reasonable
2020-01-24 04:31:54 -07:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
Ghommie
4d06d231f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-02 17:49:01 +01:00
Seris02
f663c4db96
tiny fixes
2019-12-30 11:24:12 +08:00
Seris02
1ff7709765
all of the weh.
2019-12-29 00:12:25 +08:00
Seris02
7bde63dcc4
weh
2019-12-28 23:58:28 +08:00
Seris02
4a2b7c2438
cocooooonuuuuuuts
2019-12-28 16:02:53 +08:00
Ghommie
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
Ghommie
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
Ghommie
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
Ghommie
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
Ghommie
138e7871cc
copy pasta
2019-06-17 22:48:12 +02:00
Ghommie
c0d67af8d1
Fixing vape fuck ups.
2019-06-17 22:39:17 +02:00
Ghommie
d5279c8373
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-17 09:51:22 +02:00
Ghommie
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
Ghommie
0513f3464a
one
2019-06-05 19:20:25 +02:00
deathride58
621b0675e9
Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights
2018-11-16 21:12:07 -05:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
81Denton
241d0c7a9a
Adds dance machine, drink dispensers, flavor to beach bum ruin ( #38533 )
...
* shit was SO cash
* correct dance machine subtype
* moves defines from map file to corpse.dm
* improves bartender flavor text
* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-18 09:37:48 -05:00
deathride58
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
ShizCalev
b7ae796734
Fixes cigar bugs ( #38218 )
2018-06-03 09:03:59 -05:00
JStheguy
a3a0a49b5d
Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo ( #38161 )
...
* the rainbow of mediocrity rides again
* whoops that wasn't supposed to be there
* updated vending machine, burger, and donut sprites
they've all been improved marginally
* edits roborger a bit more
"bun" is flatter, has an antenna that blinks in agony
* does sprite things to lighters and cigar cases
* darkened cigar case interiors
* tweaks lighter flames
2018-06-01 09:53:33 -05:00
ShizCalev
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00