shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,781 Commits 5 Branches 0 Tags
23b45c9cf3bbee22d00bb6681ba044bec543cfca
Commit Graph

1173 Commits

Author SHA1 Message Date
Ghom
501b4f0e3e Update watercloset.dm 2020-04-12 06:42:08 +02:00
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
kevinz000
b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden 
Atomic PR 1 or 2 - Toilet Mapping!
 2020-04-09 02:11:43 -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
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
TrilbySpaceClone
05582f567f ? 2020-04-07 09:11:20 -04:00
TrilbySpaceClone
3907a3739c Merge branch 'found_and_hidden' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into found_and_hidden 2020-04-07 07:35:31 -04: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
Trilbyspaceclone
def93f14fb Update watercloset.dm 2020-04-07 03:40:00 -04:00
Trilbyspaceclone
a6e07e5427 Merge branch 'master' into found_and_hidden 2020-04-07 03:37:09 -04:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
TrilbySpaceClone
15d9c9f0ae Revert "Revert "effort"" 
This reverts commit c3aaf27aa2.
 2020-04-04 11:01:21 -04:00
Trilbyspaceclone
32b98cce44 rip funny commit 
//We care about you Skyrats!
 2020-04-04 10:38:11 -04:00
TrilbySpaceClone
c3aaf27aa2 Revert "effort" 
This reverts commit 10ca01cc95.
 2020-04-04 10:23:14 -04:00
TrilbySpaceClone
62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
TrilbySpaceClone
10ca01cc95 effort 2020-04-04 09:30:24 -04:00
kevinz000
234dd9c439 Merge pull request #11669 from Ghommie/Ghommie-cit651 
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
 2020-03-31 18:00:02 -07:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) 
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
 2020-03-31 22:04:55 +02:00
Ghom
46e5a18bd3 Update door_assembly.dm 2020-03-29 01:03:08 +01:00
Ghommie
983d7826b6 Ports "Fixes vault and high security door material exploit and tweaks high security door cost" 2020-03-29 00:51:16 +01:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
kevinz000
eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645 
Fixing a couple issues with sofas.
 2020-03-27 21:25:31 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam3145
64254ed384 Merge pull request #11647 from BlackMajor/SpaceRuins 
Fixes welded lockers spamming chatlogs when resisting.
 2020-03-27 00:35:40 -07:00
BlackMajor
aa07bf262a lmao one line fix 2020-03-27 20:32:53 +13:00
Lin
76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643 
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
 2020-03-26 18:06:50 -05:00
Ghom
759182ed90 Update sofa.dm 2020-03-26 21:04:58 +01:00
Ghommie
ef3106aab6 Fixing a couple issues with sofas again. 2020-03-26 19:24:56 +01:00
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
necromanceranne
94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins 
Ash walker camp tweak because Ghommie asked me to.
 2020-03-17 09:29:05 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000
857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
BlackMajor
97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
Ghom
0d7612dcf5 [s] Sanitizes ParseSong tempo. 2020-03-11 00:29:31 +01:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000
c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 
Porting the musician and curator beacons.
 2020-03-08 07:34:48 -07:00