e771ea9066
Merge pull request #10374 from Trilbyspaceclone/patch-260
...
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
2020-01-01 22:07:18 -08:00
c81d0e8b66
Update energy.dm
2019-12-31 05:25:12 -05:00
e1949b0131
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-23 19:02:20 +01:00
6c8dc1d294
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise
2019-12-10 17:57:26 -06:00
bdd72fc797
make sound work?
2019-12-10 17:54:52 -06:00
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
af0110db40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-11-27 21:16:20 +01:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
bddb437872
It works now.
2019-11-18 18:30:46 +01:00
8f08e1017e
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
065fbdf0cb
Fixing gibspawner runtimes, how gruesome...
2019-11-02 19:37:35 +01:00
c1f84da39e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272
2019-10-25 12:26:17 +02:00
85b35433b2
Unmodularize Eutactic Blades.
2019-10-25 00:14:38 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
04521551f0
one commit wonder
2019-10-08 19:46:28 +11:00
5e52c62f29
actual balance.
2019-09-17 03:41:53 +02:00
0d9b284784
unneeded variable, no gameplay changes.
2019-09-16 18:12:05 +02:00
ca95d39a46
Slowing down police baton and tele baton speed.
2019-09-16 17:47:22 +02:00
67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
6fab91046d
Update misc.dm
2019-08-15 13:04:28 -04:00
ad91152c83
Update misc.dm
2019-08-14 17:08:33 -04:00
f6baaf8c58
honk honk
2019-08-14 17:06:58 -04:00
3e2f35b96c
nyoom
2019-08-11 04:04:01 -04:00
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
991e4e8d41
Fixes and standarizes sword sheaths/scabbards overlays.
2019-07-31 02:43:40 +02:00
85f87b6679
Update code/game/objects/items/melee/energy.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-07-20 21:26:18 +02:00
b87442e633
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-07-19 20:09:16 +02:00
2c41141d2f
Merge pull request #8676 from Trilbyspaceclone/patch-176
...
Adds a Rapier for 8 Trilby cats
2019-07-14 14:46:44 -07:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
05416b8f53
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176
2019-06-23 13:00:17 -04:00
d3cbbe708c
Update misc.dm
2019-06-17 14:20:11 -04:00
9cb3da57b2
Impaled
2019-06-10 17:33:49 -04:00
8cc0ca14cb
Update misc.dm
2019-06-10 17:11:39 -04:00
40030c40bf
lmao2reach
2019-06-08 07:19:11 -04:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
0d06605662
Supermatter eats the closed turf it's inside.
...
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
2019-05-30 16:17:33 +12:00
dd0dfb7517
Buffs COC and Capo sword ( #7762 )
...
* buffs COC and Capo sword
* Update misc.dm
2018-12-04 08:09:52 -08:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
ddb6f7ebae
Esword cig lighting messages fix ( #37216 )
...
* fix esword cig lighting message
`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`
* fix desword cig lighting message
`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`
* check fix
* desword check fix
* suggested message replacement
* suggested message change desword
2018-04-16 19:20:26 -05:00
kevinz000