Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
96e38e965b
Merge branch 'master' into mechs-are-vehicles
2022-03-17 22:23:48 -03:00
SandPoot
baee52349b
Upload files
2022-03-16 15:41:07 -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
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
7bf1bcf857
Some updates
2022-03-05 16:18:17 -03:00
SandPoot
21b68944e7
Upload files
2022-03-05 16:00:12 -03:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
keronshb
681679e675
cleanup
2022-02-25 22:42:27 -05:00
keronshb
1415b9580f
Last fixes
2022-02-25 22:29:09 -05:00
SandPoot
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
keronshb
cc249e1e85
Fixes some linter issues
2022-02-11 15:54:03 -05:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05: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
silicons
9205545d16
Merge pull request #15317 from LetterN/what-should-i-name-this-branch
...
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
silicons
f601580854
Merge pull request #15430 from DeltaFire15/synth-coolant
...
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08: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
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
DeltaFire
0faac6dce6
hoo boy
2021-12-14 23:06:42 +01:00
DeltaFire
5b2f9c0745
oop
2021-12-11 18:59:02 +01:00
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
22d297abe8
Merge pull request #15382 from keronshb/clockworkupdates
...
Allows Clockwork cultists to create Cogscarabs.
2021-11-20 07:03:32 +00:00
Lin
4e407ffeb6
Merge pull request #15371 from DeltaFire15/unintended-devastation
...
Devastation level explosions no longer delete organs of gibbed humans
2021-11-17 16:19:23 +00:00
keronshb
7b195c3973
Cogscarabs
...
The return
2021-11-16 22:41:08 -05:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
DeltaFire
cf777da85f
success if already loaded
2021-11-15 17:54:32 +01:00
DeltaFire
9ae59be10e
lies
2021-11-14 22:47:35 +01:00
DeltaFire
3f9ad6a954
should do this instead
2021-11-14 22:44:43 +01:00
DeltaFire
314a3a049f
lets just return true instead
2021-11-14 22:38:48 +01:00
DeltaFire
50c7d4914f
reebe loading (woo)
2021-11-14 22:25:39 +01:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
keronshb
b58d3f14a3
More adjustments
2021-10-30 10:24:58 -04:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08: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
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
keronshb
b9923de4e4
Disables the Antag UI panel for non families
2021-10-15 14:24:00 -04:00
keronshb
1427157df3
Fixes space cops and adds config for dynamic
2021-10-15 00:12:46 -04:00
