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

4584 Commits

Author SHA1 Message Date
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
Artur
c402c6dc30 Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/ 2020-04-06 13:24:52 +03:00
Trilbyspaceclone
2ba342aa1a Update kitchen.dm 2020-04-05 23:11:25 -04:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
Putnam
443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -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
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
99bf1da408 your to you 2020-04-04 10:37:37 -04:00
Kraseo
70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02: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
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
TrilbySpaceClone
10ca01cc95 effort 2020-04-04 09:30:24 -04:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
kevinz000
57fe91fafb Merge pull request #11596 from Feasel/patch-4 
[Balance Pass] - Stunbaton (Because no one wants to do a single line …
 2020-04-03 16:30:30 -07:00
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
Arturlang
598179553e Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702) 
* There we go

* Ghommie suggestions
 2020-04-03 18:34:26 +02:00
Artur
7da4ad5694 Damned title doesnt want to show up 2020-04-03 10:29:07 +03:00
Ghommie
45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Putnam3145
ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662 
Intellectual property infringment is not cool.
 2020-04-02 06:18:41 -07:00
Ghommie
e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
Putnam3145
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
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
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
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
Ghommie
5bae25c889 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659 2020-04-01 00:49:13 +02:00
Ghommie
8bb98f92ca It's past midnight, time for your runtimes flattening. 2020-04-01 00:47:29 +02:00
Kraseo
a8759b048e smashes the tyranny of public mining 2020-03-31 23:32:15 +02: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
Artur
a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
actioninja
abde27c098 layer changes 2020-03-28 23:50:08 -07:00
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07: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
0d35033736 Update twohanded.dm 2020-03-27 21:28:45 -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
kevinz000
b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642 
Adds privates visibility preferences. Also underwear now fulfills its purpose.
 2020-03-26 13:24:26 -07: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
Trilbyspaceclone
8bd238c87c Reblances flares, flashlights and eye-lights (#11404) 
* Update flashlight.dm

* makes the torch be enlightend

* Update flashlight.dm

* Update code/game/objects/items/devices/flashlight.dm

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

* >makes atmo pipes small items >makes heavy duty flashlight lightweight > muh realism

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-26 16:49:49 +01:00
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00