Commit Graph

322 Commits

Author SHA1 Message Date
chel
7de7aa6c43 Update items.dm 2024-04-11 20:12:13 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
deathride58
ae557a1df5 Merge pull request #16055 from SandPoot/point-bubbles
Pointing at something on yourself now shows the item
2024-01-06 22:51:35 -05:00
SandPoot
387b4b236c push 2024-01-07 00:37:16 -03:00
SandPoot
51c1c2abc9 huds! 2024-01-05 17:07:54 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot
2ab6c62ee6 prevent hit 2023-12-29 23:07:24 -03:00
SandPoot
2585c545fa not necessary 2023-12-28 00:37:23 -03:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
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
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot
09e351277a this 2022-07-03 01:28:39 -03:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
SandPoot
67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN
99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
keronshb
6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
SandPoot
3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
SandPoot
382473eb88 Thicc 2021-09-17 14:15:39 -03:00
SandPoot
f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot
456f68b32b Upload files 2021-09-16 01:05:28 -03:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
keronshb
5a0782e97c ACTUAL OBSERVER FIX 2021-09-05 21:34:33 -04:00
keronshb
bfd805737f Fixes mousentered 2021-08-22 12:06:40 -04:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00