shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

118 Commits

Author SHA1 Message Date
Detective Google
f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Hatterhat
e985d21ea3 fucking combifan 2020-02-01 20:23:01 -06:00
kevinz000
5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-19 20:25:51 -07:00
kevinz000
4f665930cc a a 2020-01-15 19:32:38 -07:00
kevinz000
c5b95ff5d0 Mapping helpers 2020-01-15 18:22:43 -07:00
Detective Google
f6c5f81a83 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-12 15:16:17 -06:00
Detective Google
d5b227a0ca adds the POOL to box station 
F in chat for dorms 7.
 2020-01-11 23:34:07 -06:00
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
r4d6
37d50e2aaf Add RCD effects 
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
 2020-01-03 02:13:20 -05:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000
a784235e35 scanline 2019-12-16 02:05:52 -07:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Poojawa
ee5155bdbb fixes oddities 2019-10-06 04:27:46 -05:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Poojawa
c8d7f1909d holy FUCK I got gib overlays working. Why wasn't it before? 
No one will ever know.
 2019-08-01 00:58:24 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Poojawa
7738c97b80 NYEH. fuckin' memes 2019-06-12 04:33:14 -05:00
Poojawa
26855d0698 Gibs spawn correctly. Just need to figure out the overlays now 2019-06-11 04:33:38 -05:00
Poojawa
69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Poojawa
9f80896280 eh, was going somewhere with this 
IPC gibspawner, looking into infinite footprints
 2019-05-26 05:36:33 -05:00
BurgerLua
bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
JTGSZ
6c077758c6 ports gang 2019-05-18 05:06:22 -04:00
Poojawa
0f6677b956 Blood colors happens to footprints now. 
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
 2019-05-16 08:23:53 -05:00
Poojawa
1a047c0068 I think I got it. 
Also gibs should be better too.
 2019-05-12 04:06:35 -05:00
Poojawa
773a94dea6 I really dunno at this point, weh 2019-04-17 06:28:07 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch. 
why, we get rid of them :honk:
 2019-04-17 01:18:21 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
dcb446727a Icon sync double checked for > 2mo last update 2018-09-11 00:03:21 -05:00
Letter N
6f84c924e1 ser.lazy == true (#7453) 2018-08-12 17:37:36 -07:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
Poojawa
1bbe495740 icons 2018-04-23 03:54:37 -05:00
AnturK
8a3caaae6b Mapping component helper (#37314) 
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
 2018-04-22 19:18:17 -05:00
CitadelStationBot
9892fabe4e [MIRROR] Restores empty state to 96x96.dmi (#6109) 
* Restores empty state to 96x96

* Restores empty state to 96x96.dmi
 2018-03-26 04:31:17 -05:00
Qustinnus
f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419) 
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
 2018-03-17 07:54:21 -05:00
CitadelStationBot
534c4fcc18 [MIRROR] Space Parallax Tweak (#5806) 
* Space Parallax Tweak (#36137)

* Tweaked contrasts

Upped the contrast on layer 1.
Tweaked the saturation to layer 2.

* more saturation and contrast

* tweak

* .

* Revert "."

This reverts commit 9590c657bac2c3afed007c82a7d05d36fd4249a6.

* Revert "Revert ".""

This reverts commit 6b9adf4d3fc13d6d3d934cc3eb9ea464c432c414.

* polish

* DO YOU SEE?

* Space Parallax Tweak
 2018-03-06 12:28:22 -06:00