SandPoot
d287fc25ca
poosh
2023-02-21 01:55:49 -03:00
Timothy Teakettle
71de9c13e3
Merge pull request #15962 from SandPoot/contextual-screentips
...
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
SandPoot
8ea39f9cf4
helpers
2023-02-10 00:39:04 -03:00
SandPoot
4491abc2d7
updates to most recent version and puts intent hints!
2023-02-09 02:20:02 -03:00
SandPoot
1b1154260c
correct everything and some intention based checks
2023-02-08 02:17:57 -03:00
SandPoot
5052f836e7
the stuff
2023-02-06 19:54:54 -03:00
SandPoot
ed06e686e1
pushies.
2023-01-31 16:40:17 -03:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
silicons
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
Jerry Wester
b1b4f96053
fix hilbert analyzer in RD locker
2022-12-17 20:10:41 -07:00
Lin
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
Jerry Wester
19428e2579
revert bag dumping changes
2022-12-13 19:15:07 -07:00
Jerry Wester
94bfa88ed9
add more platings
2022-12-13 19:14:43 -07:00
PeriodicChaos
183b554ed3
modsuits part 1
2022-12-11 20:30:41 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Timothy Teakettle
325d467ac5
Update mirror.dm
2022-08-13 18:45:25 +01:00
Timothy Teakettle
818e564c92
stable
2022-08-05 15:44:40 +01:00
silicons
eb7b3f706f
Update closets.dm
2022-07-28 16:17:46 -07:00
TrojanCoyote
9f37ed4d35
Update code/game/objects/structures/crates_lockers/closets/secure/security.dm
...
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2022-06-10 19:27:14 -05:00
TrojanCoyote
b4aa87431b
swap things around
...
tosses plate carrier into HoS locker, out of loadout options <3
2022-06-10 19:17:25 -05:00
SandPoot
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00: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
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
Solaris-Shade
48db01702b
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-06 22:31:51 -04:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
8cfb7a1bf4
They no longer snap south!
2022-03-24 01:03:42 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
11daaadf79
arguments.
2022-03-18 18:43:40 -03:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a
Updated Projectile code some more.
2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589
tg moved projectiles out of /item, added '/item' back
2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
SandPoot
6c347a9186
Fixes targets ( #15521 )
...
* Automatic changelog compile [ci skip]
* Update files
Co-authored-by: Changelogs <action@github.com >
2022-02-22 15:50:32 -07:00
Putnam3145
a49b19a4f7
makes reinforced plasma glass windows buildable
2022-02-19 19:14:48 -08:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
Sakura
08b38a7e70
Ashwalker Update ( #15466 )
...
* Ashwalker Update
* Update generic_positive_events.dm
* Update ashwalker.dm
* fixing newlines
* Update code/modules/antagonists/_common/antag_datum.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* literally 1984
* unlimiting spawns
* Create antag_datum.dm.bak
* Revert "Create antag_datum.dm.bak"
This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-02-03 19:34:15 -08:00
SpiWat
386a7480a7
Tweenty -> Twenty
...
Spelling.
2022-01-31 19:12:00 -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
Linzolle
afe81f711b
Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball
2021-11-26 18:46:57 -07:00
Lin
d5c17f0d84
Merge pull request #15376 from SandPoot/double
...
Double beds
2021-11-24 17:38:10 +00:00
Lin
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
keronshb
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05:00
