Commit Graph

305 Commits

Author SHA1 Message Date
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
silicons 7ccb5bc711 fixes 2021-04-26 14:21:59 -07:00
silicons 1fd06a89b7 Oh Boy 2021-03-20 16:27:52 -07:00
silicons 02b52e6142 framework 2021-03-20 16:02:26 -07:00
SandPoot 6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons 6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
Artur 91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
Artur 41f4586f50 Forgot to undo some testing changes 2021-01-20 22:30:14 +02:00
Artur 66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02: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
silicons 9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
Artur 2f619ffc4e Traits 2021-01-13 10:27:10 +02:00
Artur d5e99e9cef TESTING 2021-01-13 05:56:10 +02:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00