0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
4e9ff44ee7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-29 15:49:14 -03:00
b36da8f5d7
Revert "Revert "[DNM] Updates firemanning, throwing stuff""
...
This reverts commit def4b38a46
2023-10-12 14:34:02 -03:00
def4b38a46
Revert "[DNM] Updates firemanning, throwing stuff"
2023-10-11 13:52:03 -06:00
5a90dabd3c
stuff
2023-10-03 23:22:57 -03:00
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
b4cc0a7f50
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-16 21:18:21 -03:00
dc88c32c77
Update inventory.dm
2022-05-15 13:53:25 -07:00
ffe0a0a9e7
Update inventory.dm
2022-05-15 13:53:07 -07:00
26f6e92e70
Update inventory.dm
2022-05-15 13:52:33 -07:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
bf7cd77096
Fixes a few things
2021-10-13 23:25:01 -04:00
f6758d2b73
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-10 02:05:24 -03:00
3fa43b7f61
oops forgot this reg
2021-03-09 10:09:02 +08:00
20509121b8
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-08 14:07:57 -03:00
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
936ab121ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-18 22:53:23 -03:00
4fdacf0560
Porting putnams ventcrawling PR and Fix ( #13571 )
...
* Porting putnams rage
* And the bugfix
2020-10-17 11:39:25 +02:00
13834c4bef
Morrowinventory Port ( #75 )
2020-09-24 20:14:53 -03:00
7d2d4d870c
Merge pull request #13179 from Detective-Google/if-chain-begoen
...
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
9b943ec7a9
yee
2020-08-15 21:29:39 -05:00
bff11c4fe5
fixes, changes.
...
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648 )
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629 )
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
ffcfd21613
fix
2020-07-27 14:24:10 -07:00
a34a7ba5d4
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-06-28 01:10:22 +02:00
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
c551006295
catch dropped
2020-04-22 10:54:42 -07:00
289d581e66
ok bet
2020-03-26 12:19:09 -07:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
2426849d4b
this is a pretty bad idea
2019-10-22 02:19:33 -07:00
9c3e532be7
Fixes lack of arguments on mobs' can_equip.
2019-10-09 00:21:55 +02:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
7db87db43a
fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing ( #7997 )
2019-02-13 21:02:00 -08:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
f986f9c9f2
makes it compile. should work. hopefully
2018-07-02 15:35:11 -04:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
67841c3f19
Fixes pocket items being deleted when monkeyizing ( #38220 )
2018-06-03 09:04:08 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
003eced6af
[s] Removes some stationloving-related failure surface ( #37727 )
...
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
2018-05-08 16:40:56 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
832f071b59
mob stuff
2018-04-23 02:26:53 -05:00
4fb2e612df
Fixes bloodbath effects not working on people in crit ( #36598 )
...
Also some minor improvements to performance by caching the nearby mobs list once
2018-04-03 22:01:59 -05:00
SandPoot