Commit Graph

21861 Commits

Author SHA1 Message Date
Nukechickenu64
37fd47d8f7 modulizing 6
should be the final commit that modulizes as much as possible
2022-10-05 18:44:50 -04:00
Nukechickenu64
9d91bd48bd value fix
simple value fix
2022-10-05 01:16:55 -04:00
Nukechickenu64
7009e82ebe cleanup 4
cleaning up more
2022-10-04 23:00:14 -04:00
Nukechickenu64
811f3721f7 modularizing bit mroe
still an error trying to fix
2022-10-04 19:50:03 -04:00
Nukechickenu64
e6928f01ef Merge remote-tracking branch 'upstream/master' into nukechickens_forge 2022-10-03 20:40:23 -04:00
Nukechickenu64
14fca66ca1 Revert "modularizing"
This reverts commit 4726adcf37.
2022-10-03 20:39:29 -04:00
Nukechickenu64
4726adcf37 modularizing
starting on modularizing
2022-10-02 22:49:20 -04:00
Nukechickenu64
35764d3898 fix #2
makes it so we dont reuse the vamps blood drain
2022-10-01 22:47:34 -04:00
Nukechickenu64
6193514842 fix
quick fix to some things
2022-10-01 21:15:13 -04:00
Nukechickenu64
94759db4c8 Bloodsucker Fledgeling quirk and quirk ability section in code
adds a vampiric quirk that makes you only be able to gain nutrients from blood and be able to bite, along with their problems, also adds section to add in abilities for neutral quirks
2022-10-01 20:04:53 -04:00
BongaTheProto
abd2ba473e Merge pull request #508 from Hideyoshi1/master
Qareen update (almost complete now (needs sprites and a smidge more code (+maybe some re-balancing later)))
2022-10-01 11:49:38 -05:00
BongaTheProto
f1ed056576 Merge remote-tracking branch 'upstream/master' 2022-09-28 15:26:54 -05:00
NullFag
723d2c8d0f Adds jumpskirt peeking (#264) 2022-09-28 16:16:06 -03:00
Iosyf
33d895376c Merge branch 'SPLURT-Station:master' into master 2022-09-28 21:20:11 +03:00
Iosyf
fda19d3d11 Qareen Almost Completion
- Added the Qareen to the spawnable antagonists list
- Finished modifications to the "Bliss", "Harvest" and "Malfunction"  abilities
- All that's left now is the manifestation (but I couldn't find any spriters for it so...)
- Probably needs to be balanced
2022-09-28 21:19:28 +03:00
SandPoot
a2baf4e789 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-28 15:14:24 -03:00
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
BongaTheProto
e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
NullFag
74e9e4e38b Lizard genitalia (#263)
* shit

* h
2022-09-27 22:46:50 -03:00
SandPoot
f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
2022-09-23 16:26:54 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return
Fixes the mining borg point card
2022-09-23 16:24:36 -07:00
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
2022-09-23 16:21:19 -07:00
silicons
ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2
Updates auxmos to 2.0.0
2022-09-23 16:20:31 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
2022-09-23 16:16:03 -07:00
Putnam3145
1ac44f22c8 i am wont to make the worst mistakes 2022-09-21 17:55:34 -07:00
Putnam3145
223307aaa8 i need to reimplement this joy 2022-09-21 17:43:37 -07:00
shellspeed1
17f513eae4 Fixes clicking in the object menu but at what cost 2022-09-20 23:08:24 -07:00
BongaTheProto
9025f54d7a Merge pull request #464 from ItsSelis/tgui-input-framework
TGUI Input Framework
2022-09-20 10:27:32 -05:00
BongaTheProto
560c837469 follow-up (aka snap rbmk)
Except for the parts they didn't port over
9cdaffc417
2022-09-18 23:43:45 -05:00
BongaTheProto
9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
Putnam3145
eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145
fa9bbfaedf Revert "Update auxmos to 2.0.0" (#15859) 2022-09-18 16:40:45 -07:00
Putnam3145
d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
BongaTheProto
0d5f2ab542 Merge pull request #492 from Zirok-BYOND/miscfixes
Miscfixes
2022-09-18 14:59:01 -05:00
Zirok
4cbea8acc8 revert the pai examine fix, as it duplicates borg examine text 2022-09-18 09:14:21 +02:00
Lin
a0bc2c1e09 Merge pull request #15826 from Putnam3145/auxmos-2
Update auxmos to 2.0.0
2022-09-18 05:44:58 +00:00
SandPoot
cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
Lin
07484bb09f Merge pull request #15850 from Putnam3145/bastion-bourbon-shitcode
fixes the worst use of a for loop ever
2022-09-17 23:13:41 +00:00
shellspeed1
b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
shellspeed1
d83747dc74 Ports Quantum Spin Inverter from TG. (#15846)
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
2022-09-17 13:39:32 -07:00
shellspeed1
a3c01b96f3 Update xeno.dm (#15837) 2022-09-17 13:37:55 -07:00
shellspeed1
d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
shellspeed1
1ebc2e584b makes weapons unsafe 2022-09-17 06:53:46 -07:00
shellspeed1
15006a5dfd Revert "adds gun safeties, remember to turn them off."
This reverts commit 9ca985b769.
2022-09-17 06:47:26 -07:00
shellspeed1
c886e2fd24 forgot this 2022-09-17 06:38:19 -07:00
shellspeed1
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00