kevinz000
b3afed69f4
huffles
2020-06-08 08:47:06 -07:00
Ghommie
ad6b835e8b
Linter.
2020-06-08 08:12:29 +02:00
TheSpaghetti
e4763b5f6e
let's try that again
...
more insectoid insects
2020-06-07 18:12:49 -04:00
kevinz000
92d1af5889
adjustments
2020-06-04 22:18:19 -07:00
kevinz000
bad809ffce
fixes
2020-06-04 19:56:06 -07:00
Trilbyspaceclone
0b0e9011a7
Prevent surgery tools and items from being rad contaminatable ( #12413 )
...
* Update tools.dm
* Update tools.dm
* Update robot_modules.dm
2020-06-04 15:56:15 -07:00
Yawet330
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
Timothy Teakettle
1406364889
fix emps
2020-06-04 15:25:56 +01:00
Timothy Teakettle
f2aa370506
make ipcs cool
2020-06-04 14:59:52 +01:00
kevinz000
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
TrilbySpaceClone
937731d77d
fix and tested
2020-06-02 21:32:36 -04:00
TrilbySpaceClone
b62ef0f4e8
right...
2020-06-02 19:44:47 -04:00
ynot01
ab3799ae7a
Ports cornrows hairstyles from yogstation ( #12423 )
2020-06-02 15:29:07 -07:00
Ghom
ea763df326
Photosynthesis element. ( #12394 )
...
* Photosynthesis element.
* element yaketi sax.
* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom
a41f40503d
More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. ( #12347 )
...
* A more lenient soft stamina crit.
* Yea, your shots are gonna go straight toh.
* accuracy whacks (leaves the bow as is for now).
* Fixing stam penalties calculations, spread the range.
* aaaaaah
* 1.4 seconds delay vs 1.2
* Thanks, linter.
* Missed one.
2020-06-02 15:22:06 -07:00
Lin
348885a58d
Merge pull request #12382 from Ghommie/Ghommie-cit797
...
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00:00
kevinz000
abc2b820a4
Update living_blocking_parrying.dm
2020-05-30 23:49:04 -07:00
kevinz000
5b6e797c4f
desword adjustments
2020-05-30 23:43:05 -07:00
kevinz000
250d078596
that was easy
2020-05-30 23:14:02 -07:00
kevinz000
34d8aa0ee9
refactor
2020-05-30 23:13:16 -07:00
kevinz000
d832cb6526
fix
2020-05-30 22:43:23 -07:00
kevinz000
2232271ea5
fixes and render
2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9
definition fixes
2020-05-30 22:09:13 -07:00
kevinz000
c613726c2a
render
2020-05-30 22:05:19 -07:00
kevinz000
e6020ca22c
variable render
2020-05-30 21:02:13 -07:00
kevinz000
0723399ed4
render
2020-05-30 20:55:33 -07:00
kevinz000
d47841ee54
documentation
2020-05-30 20:38:07 -07:00
kevinz000
e5c32c1746
changes
2020-05-30 20:11:18 -07:00
Ghommie
9a9e76664f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 22:47:13 +02:00
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
kevinz000
3251338d31
fix
2020-05-30 02:01:06 -07:00
kevinz000
519552cb78
more handling
2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34
is this a good idea
2020-05-30 01:46:43 -07:00
kevinz000
b74d465b6c
fix
2020-05-30 01:22:09 -07:00
kevinz000
6b0b20b171
infinite loop protection
2020-05-30 01:00:41 -07:00
kevinz000
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
kevinz000
f63bc2e2d3
flags
2020-05-30 00:42:41 -07:00
kevinz000
ae9fc5789d
adds more support to stuff
2020-05-30 00:35:17 -07:00
kevinz000
517cd26ed3
Delete living_combat.dm
2020-05-29 19:19:49 -07:00
kevinz000
65bb3bbb91
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-29 19:13:22 -07:00
kevinz000
92a537da63
Damage fix
2020-05-29 19:12:46 -07:00
kevinz000
a8c0681e99
parrying works
2020-05-29 18:58:02 -07:00
kevinz000
8630c1481a
effect text
2020-05-29 18:57:03 -07:00
kevinz000
809de27ffe
yanderedev
2020-05-29 18:47:58 -07:00
Ghommie
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
Rohesie
5ab8d41d9a
horns ( #12384 )
2020-05-30 03:25:27 +02:00
kevinz000
1f337ac65e
itnerrupt
2020-05-29 18:03:04 -07:00
kevinz000
c9f651b6bd
fix
2020-05-29 18:00:35 -07:00
kevinz000
09770891a0
fix
2020-05-29 17:53:29 -07:00
kevinz000
14706a98f4
fixes
2020-05-29 17:48:58 -07:00
