shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

5635 Commits

Author SHA1 Message Date
necromanceranne
157ef93c0b I think everyone should be landing punches now. 2020-04-01 15:12:59 +11:00
Ghom
5f128447f5 Update guardian.dm 2020-04-01 02:21:50 +02: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
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
021ebcec66 Massive megafauna buff. 2020-03-31 14:09:32 +02:00
kevinz000
2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07:00
kevinz000
6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00
Lin
4eaf8882f3 Merge pull request #11670 from Citadel-Station-13/Ghommie-patch-2 
fixing no grav limbless slowdown
 2020-03-30 19:57:14 +00:00
Ghommie
21a42579c1 chucklefucks. 2020-03-30 18:55:30 +02:00
Ghommie
2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00
kevinz000
03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-29 20:44:49 -07:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07:00
Lin
659873979f Merge pull request #11656 from Xantholne/bumbleswakeup 
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
 2020-03-29 02:06:09 +00:00
Ghom
1ab929c7c9 fixing no grav limbless slowdown 2020-03-29 00:58:33 +01:00
kevinz000
9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07: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
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
kevinz000
31c5996a5d sound effects + block pixelshift visuals 2020-03-27 21:10:02 -07:00
Ghom
a85d590b1d Update bumbles.dm 2020-03-28 03:35:12 +01:00
Unknown
013e591218 Bumbles wake up sleepy head 2020-03-27 20:22:22 -06:00
ZeroMan
9f6c97c63f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme 2020-03-27 22:10:42 -04:00
ZeroMan
6e6d8b5098 didnt port this properly 2020-03-27 22:07:48 -04:00
ZeroMan
dba359cbaa commit not alive immediately 2020-03-27 20:51:04 -04:00
Putnam3145
b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646 
Moderately unoriginal PR title about runtime errors.
 2020-03-27 17:12:49 -07:00
ZeroMan
54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
ZeroMan
7b34ebc9b5 commit not alive immediately 2020-03-27 17:13:45 -04:00
Putnam3145
47c0cc8057 Merge pull request #11633 from Citadel-Station-13/Ghommie-patch-5 
Blacklists unsynthetizable reagents from botany bees.
 2020-03-26 18:53:44 -07:00
Lin
d907a4948b Merge pull request #11615 from Citadel-Station-13/Ghommie-patch-3 
Fixing creamed snout overlay a second time.
 2020-03-26 17:57:50 -05:00
Ghommie
3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
kevinz000
ba713508ce counterattacking? 2020-03-26 14:19:54 -07:00
kevinz000
8fe064da74 save memory.. 2020-03-26 14:13:18 -07: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
kevinz000
3eca22350a Merge pull request #11608 from Citadel-Station-13/Ghommie-patch-1 
Fixes cold movespeed slowdown affecting floating mobs (no gravity).
 2020-03-26 13:24:06 -07:00
kevinz000
135ca27281 parry 2020-03-26 13:08:05 -07:00
kevinz000
4391fc3714 pixel shifting 2020-03-26 12:51:17 -07:00
kevinz000
940cdd13b0 compile 2020-03-26 12:29:43 -07:00
kevinz000
555702c1d7 flag define precedence 2020-03-26 12:28:05 -07:00
kevinz000
2fd129b74b macros 2020-03-26 12:19:26 -07:00
kevinz000
289d581e66 ok bet 2020-03-26 12:19:09 -07:00
kevinz000
92b809634b k 2020-03-26 11:32:18 -07:00
Ghom
4e531518c3 Update bees.dm 2020-03-26 17:20:57 +01:00
Ghom
38c37d75a3 Update bees.dm 2020-03-26 17:15:45 +01:00
deathride58
0bf2cf0484 Adds a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat buttons (toggleable via prefs) (#11623) 
* Adds a flashing effect to the sprint and combat mode toggles (toggleable via prefs)

* Adds the ability to change the color of the hud toggle flash as well
 2020-03-26 16:51:48 +01:00
kevinz000
825adfa29f whew 2020-03-25 21:23:54 -07:00
kevinz000
13a8e7a777 k 2020-03-25 21:06:01 -07:00
kevinz000
0774bca2f4 wew 2020-03-25 20:51:42 -07:00