shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,711 Commits 5 Branches 0 Tags
c8ebc6411e9ad3dbdf66ab4e8a1988e745ecae24
Commit Graph
32711 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Putnam 3365466db7 Couplea fixes to the previous tweak 2020-04-03 02:25:16 -07:00
Putnam d398c5276c Also made all these "else ifs" into a "switch" 2020-04-03 01:59:48 -07:00
Putnam 492546c05c Pacifist digestion checks are elsewhere anyway 2020-04-03 01:53:35 -07:00
necromanceranne 0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Artur 7da4ad5694 Damned title doesnt want to show up 2020-04-03 10:29:07 +03:00
GhomandGitHub 37b6aa9897 Update dwarves.dm 2020-04-03 05:31:37 +02:00
Ghommie 4ef42ba6b1 Dwarfy message spam QoL. 2020-04-03 05:16:17 +02:00
necromanceranne b37dc1e322 Merge branch 'punch' into pawnch_2_the_pawnchening 2020-04-03 14:02:42 +11:00
necromanceranne e1a013bcb2 I'm tired okay 2020-04-03 11:30:00 +11:00
necromanceranne c481db2bfd nearly added instastun king hits, now stun punches are more rng 2020-04-03 11:25:29 +11:00
Putnam3145andGitHub d74f5dcec5 Merge pull request #11717 from PersianXerxes/oopsPHManBad 
Chem Dispensers and Heaters now show pH again
 2020-04-02 16:55:45 -07:00
necromanceranne f26a9b948c pawnch harder get tired less this is a balance change now I guess 2020-04-03 10:50:26 +11:00
Ghommie 1c81c8676b Stops alopecia. 2020-04-03 00:33:38 +02:00
Ghommie 5a63eba57a Stops a monky trick with mob holders. 2020-04-03 00:23:58 +02:00
Ghommie 58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02:00
Timothy Teakettle 6b3de998c0 remove noreact from being used in plants 2020-04-02 21:18:27 +01:00
Timothy Teakettle 0dcc630c4a ports some trait changes 2020-04-02 21:15:04 +01:00
CitadelStationBot 431722e34d Automatic changelog generation for PR #11719 [ci skip] 2020-04-02 08:18:43 -05:00
Putnam3145andGitHub ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662 
Intellectual property infringment is not cool.
 2020-04-02 06:18:41 -07:00
TrilbyspacecloneandGitHub 3948214380 Update handguns.dm 2020-04-02 09:18:37 -04:00
Ghommie e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
CitadelStationBot 47f1c15fd8 Automatic changelog generation for PR #11708 [ci skip] 2020-04-02 07:25:37 -05:00
Seris02andGitHub 4902d5ab4e makes sergal markings better (#11708) 2020-04-02 14:25:34 +02:00
kiwedesparsandGitHub 9b6cd54abf there's an extra space and it bugged me im sorry 2020-04-02 00:35:38 -07:00
kiwedesparsandGitHub eeccea989c purple nerf - light pink gets epi back 2020-04-02 00:34:44 -07:00
Persi c3d9a4855f Fixed pH and purity issues 2020-04-02 03:31:32 -04:00
kiwedesparsandGitHub d9e8db8a6c Update _status_effects.dm 2020-04-01 23:31:51 -07:00
Putnam3145andGitHub 736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659 
It's past midnight, time for your runtime errors fixing.
 2020-04-01 23:16:29 -07:00
kevinz000 baf5150c51 fixes two runtimes 2020-04-01 22:35:26 -07:00
CitadelStationBot e32d4f9713 Automatic changelog generation for PR #11701 [ci skip] 2020-04-01 22:54:35 -05:00
Putnam3145andGitHub a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657 
Massive megafauna buff.
 2020-04-01 20:54:32 -07:00
CitadelStationBot 53d0cb765f Automatic changelog generation for PR #11604 [ci skip] 2020-04-01 09:19:13 -05:00
dapneeandGitHub 6f4281b4b8 Even More fixes to Lambda (#11604) 
* Update lambda.dmm

even MORE fixes

* Update lambda.dmm

some more vents in maintenance, air canisters, and mystery coin

* Update lambda.dmm

more shit

* darn you ghommie

hopefully fixes conflicts

* Create lambda.dmm

okay, let's try this

* Update lambda.dmm

fingers crossed
 2020-04-01 16:19:10 +02:00
Ghommie 519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Artur 881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
necromanceranne 13c474f2af brawling just got mathematical? 2020-04-01 22:05:22 +11:00
Artur e23bacdf6b Icons 2020-04-01 13:03:31 +03:00
Artur 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur 4de14fbdf7 Finnishing touches 2020-04-01 12:59:06 +03:00
Artur dce23a40af God i wish i could auto merge icons 2020-04-01 12:05:53 +03:00
Artur f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03:00
CitadelStationBot c13541b15c Automatic changelog generation for PR #11700 [ci skip] 2020-04-01 03:03:17 -05:00
kevinz000andGitHub 82c8710267 Merge pull request #11700 from kiwedespars/papermask 
adds new cosmetic and craftable paper masks.
 2020-04-01 01:03:14 -07:00
necromanceranne 157ef93c0b I think everyone should be landing punches now. 2020-04-01 15:12:59 +11:00
Ghommie 73c52c0c6e Accurate minefield. 2020-04-01 05:19:29 +02:00
Ghommie 04c8cb09a4 out of bounds coordinates sanity 2020-04-01 04:41:21 +02:00
Ghommie 736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02:00
CitadelStationBot 99263f1957 Automatic changelog generation for PR #11698 [ci skip] 2020-03-31 20:04:31 -05:00
kevinz000andGitHub 37625adb69 Merge pull request #11698 from Ghommie/Ghommie-cit656 
The banishment of the floating disembodied phallus.
 2020-03-31 18:04:28 -07:00
CitadelStationBot 9efc69d229 Automatic changelog generation for PR #11693 [ci skip] 2020-03-31 20:04:06 -05:00