shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,657 Commits 5 Branches 0 Tags
4e8f771e2cec513f4a52bbf1a9bc5bdf49ff0c53
Commit Graph

21215 Commits

Author SHA1 Message Date
kevinz000
4e8f771e2c ] 2020-04-11 09:15:03 -07:00
kevinz000
238665f464 progress 2020-04-11 09:13:10 -07:00
kevinz000
c1f5ad310b wew 2020-04-11 09:01:51 -07:00
kevinz000
8132db65b1 interrupt funtion 2020-04-11 05:59:11 -07:00
kevinz000
f8a7a68ac3 lmao 2020-04-11 05:52:37 -07:00
kevinz000
65f61c968c k 2020-04-11 05:16:42 -07:00
kevinz000
76e93d504a this massive proc lmao 2020-04-11 05:15:50 -07:00
kevinz000
8a8cfbe54a fixes 2020-04-11 05:13:17 -07:00
kevinz000
41f359db83 fixes 2020-04-11 05:11:42 -07:00
kevinz000
234687c5c8 do_after_advanced 2020-04-11 05:10:07 -07:00
kevinz000
99edc1e1a5 make it compile for blocking test 2020-04-11 03:40:52 -07:00
kevinz000
d44d5168d8 progress.. 2020-04-10 22:50:53 -07:00
kevinz000
3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-04-08 04:04:45 -07:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
kevinz000
3901049c0d Update shields.dm 2020-04-07 12:50:01 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Putnam3145
dad6ddb042 Merge pull request #11764 from Ghommie/Ghommie-cit668 
Fixing spellcasting and edge cases.
 2020-04-07 02:50:24 -07:00
Putnam3145
536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes 
The contractor pod now gives regen jelly instead of omnizine
 2020-04-07 02:43:33 -07:00
kevinz000
557df9f21a Merge pull request #11755 from Trilbyspaceclone/patch-335 
Corrects plastic knife damage
 2020-04-07 02:00:35 -07:00
kevinz000
9c0567027b Merge pull request #11768 from timothyteakettle/uplinks-population-update 
uplink content updates with the current population
 2020-04-07 01:59:58 -07:00
kevinz000
029f8ff698 Merge pull request #11763 from necromanceranne/popcap_time 
Pop caps Sleeping Carp and Rising Bass to 30 players.
 2020-04-07 01:58:14 -07:00
kevinz000
ef2eaf2233 Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes 
They put me in a padded cell for spriting and porting.
 2020-04-07 01:56:21 -07:00
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02:00
kevinz000
287fbba4b8 Merge pull request #11758 from Putnam3145/add-ai-facing-message 
[s] Adds a message to AIs when they encounter a certain bug.
 2020-04-06 16:03:56 -07:00
kevinz000
ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1 
Lil minesweeper edge case.
 2020-04-06 15:48:50 -07:00
kevinz000
ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 
Fixed the epic nuke exploit
 2020-04-06 15:48:02 -07:00
kevinz000
a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak 
Atomic PR 1 or 2 - Toilet Loot!
 2020-04-06 15:47:39 -07:00
kevinz000
d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -07:00
kevinz000
a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance 
Changed how scanners show organ damage.
 2020-04-06 15:46:49 -07:00
kevinz000
699f891166 Merge pull request #11750 from Putnam3145/pluoxium 
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
 2020-04-06 15:46:09 -07:00
Timothy Teakettle
aabcfb580b discounts rerolling is bad 2020-04-06 19:49:06 +01:00
Timothy Teakettle
864f9b3244 except this times its in the right order 2020-04-06 18:59:48 +01:00
Timothy Teakettle
e8002ee449 imagine if it compiled and was less bad 2020-04-06 17:45:19 +01:00
Timothy Teakettle
3b322b9f7c population locked uplink items use current population 
yay?
 2020-04-06 17:34:34 +01:00
Ghommie
f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
Trilbyspaceclone
faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747) 
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
 2020-04-06 17:53:43 +02:00
Ghommie
b92da66f04 Fixing spellcasting and edge cases. 2020-04-06 17:32:51 +02:00
necromanceranne
eece94caf3 puts a pop cap on the various martial arts. 2020-04-07 00:28:09 +10:00
Putnam
5f71efe07a Adds a message to the AI to reconnect, since this is a common bug 2020-04-05 22:41:50 -07:00
Ghom
33fc3ce1e0 Update spell.dm 2020-04-06 07:05:33 +02:00
Trilbyspaceclone
2ba342aa1a Update kitchen.dm 2020-04-05 23:11:25 -04:00
Putnam3145
5108bf1fc3 Stuff about power (#11664) 
* Overhauled how APCs work, I guess

* Makes cells drain like before
 2020-04-06 04:26:14 +02:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
Putnam
443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -07:00
Putnam
31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
Trilbyspaceclone
7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
Putnam
1bf37dfb1b Doubles pluoxium specific heat 2020-04-04 22:04:37 -07:00
kevinz000
956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00