shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,313 Commits 5 Branches 0 Tags
a950bcb0fb57e18b7716cfada36ae680aae94462
Commit Graph

95 Commits

Author SHA1 Message Date
Timothy Teakettle
46dbb9345d slime puddles look better and cant be abused by lings (#13567) 
* perfect

* further changes

* no squeaking please

* no more squeaking damnit

* no more squeaking damnit

* slower

* they get broken armor

* broken armor application

* Apply suggestions from code review

* add a comma

* make crossed work properly

* Update squeak.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-11-01 21:40:58 +01:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
timothyteakettle
97564312e3 mindreaders know your move 2020-08-26 17:06:58 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Artur
e3ba2e60c6 Not supported 2020-07-08 20:31:08 +03:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Artur
098b6642ae Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-22 16:19:17 +03:00
Ghom
bcd911070a Fixing dwarfism. (#12331) 
* Update body.dm

* Update dwarves.dm
 2020-05-21 12:38:42 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
6696560656 slendermen fix. (#12303) 
* slendermen fix.

* Whops

* Update dwarfism.dm
 2020-05-20 18:43:14 -07:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam
f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Artur
a8aa2e2014 Updates modular computers, begins work on shuttle stuff. 2020-04-23 15:06:35 +03:00
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Ghommie
39aef14924 More ToS Compliance. 2020-04-19 02:40:58 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghom
a38e6e88a0 Enables hulk smash. 2020-04-10 14:07:39 +02:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
Ghommie
519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +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
Ghommie
3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
Seris02
332099953b removes xray from the gene pool 2020-03-20 11:15:47 +08:00
Ghommie
4c87f2256c genetics 2020-03-16 02:04:48 +01:00
kappa-sama
29f7c9026f buffies 2020-03-14 22:09:08 -04:00
Ghom
88bdc6d068 Merge pull request #11440 from kevinz000/master_fix 
fixes master
 2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699 Update actions.dm 2020-03-12 01:47:51 +01:00
kappa-sama
80b17cff1f Merge branch 'master' into patch-17 2020-03-11 20:26:13 -04:00
Seris02
067e2e4506 probably fixes hulk 2020-03-09 18:15:12 +08:00