shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,757 Commits 5 Branches 0 Tags
eac4854adf35e8274458eeeeae85c5f1c19ddd0d
Commit Graph

105 Commits

Author SHA1 Message Date
CitadelStationBot
9dd40f1fad Adds coalesce to world.internet_address 2017-05-29 09:15:12 -05:00
CitadelStationBot
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
adc1b96b74 this is kenzie's fault 2017-05-12 15:25:11 -05:00
LetterJay
6d1fb0d48a the ride never ends 2017-05-12 10:54:57 -05:00
LetterJay
745bf3b321 client procs... client procs.... client procs.... 2017-05-12 09:57:20 -05:00
LetterJay
55492bb8ec even more client fixes! this time with added admin fixes 2017-05-12 09:52:42 -05:00
LetterJay
59497ff049 more client fixes 2017-05-12 02:41:12 -05:00
LetterJay
e748d40401 Update client_procs.dm 2017-05-12 02:29:03 -05:00
LetterJay
fd5b7566fd update client_procs.dm 2017-05-12 01:49:56 -05:00
LetterJay
6a1cac4e1e Merge branch 'master' into upstream-merge-26425 2017-05-12 00:08:32 -04:00
LetterJay
8bb34472b7 fuck 2017-05-11 23:07:50 -05:00
LetterJay
ff414d3a27 rej cleanup 2017-05-11 23:00:26 -05:00
CitadelStationBot
6c4524700b Fixes character saves getting fucked up if there are no configured round start races. (#742) 2017-05-11 19:24:59 -07:00
LetterJay
b7acf503eb rej cleanup 2017-05-10 22:35:01 -05:00
LetterJay
a66e0c949e Merge pull request #832 from Citadel-Station-13/upstream-merge-23201 
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
 2017-05-10 23:05:37 -04:00
LetterJay
746da812bf Delete client_procs.dm.rej 2017-05-10 22:00:44 -05:00
LetterJay
43318a88a5 rej fix 2017-05-10 21:59:41 -05:00
LetterJay
3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -04:00
LetterJay
57372ebdb0 merge 2017-05-10 19:41:55 -05:00
CitadelStationBot
181eee013e [READY]DATUM VERBS AND TOP MENUS! 2017-05-07 17:07:59 -05:00
kevinz000
b440ba70b0 Delete suicide.dm.rej 2017-05-06 11:49:26 -07:00
kevinz000
c5f7644452 Update suicide.dm 2017-05-06 11:48:24 -07:00
CitadelStationBot
7288549dec Players may no longer commite suicide 2017-05-05 18:08:56 -05:00
CitadelStationBot
3b84fcb9c2 Playar byound accunt age storid in db 2017-05-04 18:14:23 -05:00
CitadelStationBot
49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
404b2314c5 Fixes changelog assets 2017-04-27 15:38:42 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
e7df2bc14a [MIRROR] Minor refactors (#515) 
* Minor refactors

* Update client_procs.dm

* Delete client_procs.dm.rej
 2017-04-26 11:13:41 -05:00
LetterJay
de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
LetterJay
f38f1e383b Merge pull request #488 from Citadel-Station-13/upstream-merge-26344 
[MIRROR] Fixes double warnings on new players connecting.
 2017-04-24 21:27:40 -05:00
CitadelStationBot
add1419809 fixes the server 2017-04-23 10:22:18 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493) 
* some porting

* other changes
 2017-04-20 22:00:47 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134 
[MIRROR] Refactors dbcon into a subsystem
 2017-04-19 20:46:02 -05:00
CitadelStationBot
1c410999e7 Fixes double warnings on new players connecting. 2017-04-19 16:47:40 -05:00
TalkingCactus
6f0aa809df Patches for 4/18/17 (#454) 
* fixes modular receiver sprites

* fixes legs rendering for taurs

* fixes shoes not rendering in UI for nagas

* typo fix in preferences.dm

* crewsimov

* Revert "fixes legs rendering for taurs"

This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.

* fixes looc logging

* fixes gamemode voting

* admin respawn bypass

* thanks GitHub Desktop

totally wanted to omit the very important if()

* proc tweak

* savefile sanitizing
 2017-04-18 18:38:23 -04:00
CitadelStationBot
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -05:00
LetterJay
a2f39d3d89 character data slot fix 2017-04-16 13:20:45 -05:00
TalkingCactus
abd7f2b348 Cleans Up Rejected Mirror files (#414) 
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
 2017-04-15 17:55:53 -04:00
CitadelStationBot
2373e2e485 Afk fixup (#412) 2017-04-15 15:45:29 -04:00
ktccd
c785038994 Huge Sprite Rework (#342) 
* Revert "Revert "Huge Sprite Rework""

* Compilation of all feedback fixes

This commit contains all the suggested fixes so far and the changes we
came up with through discussion about the code.
For example, genitals **may** now use alternate icons for aroused
states, but does not have to, this is decided by a boolean variable in
the sprite accessory itself, defaulting to not using alternate icons.
Genital icon_state names now follow a new format to match these new
options in a modular way for all kinds of genitals.

* Conflict solving

reformats all the taurs to use the TAUR layer instead of the BODY_FRONT
layer. Same for the new Eevee sprites.

* Committing the old, unfixed file.

This will cause errors if used, but at least it won't cause conflicts.

* Contains fixed sprite names

The shepherd taur body should STILL have a hole in the body due to a
pixel error.
I have forgotten which pixes these are, so.... **le shrug**

* Anger commit

Commiting this in anger. I WILL make it work damnit!

* Proper name fixes.

Also renames the taur cow to no longer have an incorrectly duplicate
icon_state.

* Shepherd taur pixel fix

Fixes the missing pixels from the taur body that caused a hole to appear
when viewed from the sides.

* Conflict resolution

This PR will cause some sprite-breaking overlay errors.
But it's the only way to handle the conflicting .dmi.
So I'll make a separate PR to fix the sprites later.

* Fixes global lists

Now they use whatever weird new system we got for them.
 2017-04-15 07:24:44 -04:00
Poojawa
9e72b1b8fd /tg/ 4/14 (#367) 
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
 2017-04-14 23:28:04 -05:00
LetterJay
d0347280ce adds vore back (why this was removed, I have no idea) 2017-04-14 13:40:44 -05:00
Poojawa
7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
LetterJay
d12a1d88a5 Revert "Huge Sprite Rework" 2017-04-04 16:34:55 -05:00