33941c29c8
[MIRROR] People can be cloned from heads or brains ( #919 )
...
* People can be cloned from heads or brains
* .rej fixes
* Update cloning.dm
2017-05-18 09:49:26 -05:00
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
626959d96e
[MIRROR] Fixes a bunch more cult bugs ( #853 )
...
* Fixes a bunch more cult bugs
* Resolves .rejs and icons
2017-05-18 03:21:07 -05:00
61f8819286
oops
2017-05-18 02:37:12 -05:00
a8a862411d
commit
2017-05-18 02:31:07 -05:00
6fe8d4fc9c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27219
2017-05-18 02:27:50 -05:00
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
f978e3d56e
rej cleanup
2017-05-17 03:50:34 -05:00
45c283a935
applies the previous fixes for cult on a closed PR
2017-05-16 22:59:41 -05:00
be1702ff0d
Revert "CultFix"
...
This reverts commit f3e8cd3e2d
2017-05-16 22:49:23 -05:00
f3e8cd3e2d
CultFix
2017-05-16 21:36:07 -05:00
4710beca0e
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
...
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
3b0b19f6b6
Fixes role polls
2017-05-14 19:42:51 -05:00
00b17f1649
maybe
2017-05-14 00:28:07 -05:00
6a1cac4e1e
Merge branch 'master' into upstream-merge-26425
2017-05-12 00:08:32 -04:00
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
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
57372ebdb0
merge
2017-05-10 19:41:55 -05:00
181eee013e
[READY]DATUM VERBS AND TOP MENUS!
2017-05-07 17:07:59 -05:00
f85a44ed52
2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-06 11:56:16 -05:00
310f23db5c
Fixes HTTPSGet being unprotected
2017-05-06 10:46:00 -05:00
3b84fcb9c2
Playar byound accunt age storid in db
2017-05-04 18:14:23 -05:00
49990d0c05
Persistent investigate and game logs separated by round ID
2017-05-02 18:47:58 -05:00
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
a0c1f979dc
Fixes templates/ruins not updating area list
2017-04-27 17:02:33 -05:00
a3cd0d980a
Fixes a bad proc definition
2017-04-26 19:29:03 -05:00
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
84321916a5
Refactors ears into organs ( #513 )
...
* Refactors ear damage into ear organs
* Update human.dm
* Update species.dm
* Delete species.dm.rej
* Update tgstation.dme
* Delete tgstation.dme.rej
* Delete human.dm.rej
* Update tongue.dm
* Delete surgery.dmi
* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
76ed57f90c
rej cleanup
2017-04-25 02:11:11 -05:00
9df952873b
Update type2type.dm
2017-04-25 01:55:12 -05:00
31e8bee39e
Update type2type.dm
2017-04-25 01:54:53 -05:00
3d51a07243
world fix
2017-04-25 01:52:49 -05:00
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
a06c6a2994
Merge pull request #508 from Citadel-Station-13/upstream-merge-26337
...
[MIRROR] Refactors picture frames to use wall frames system
2017-04-25 01:10:40 -05:00
e27c5c8db3
Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
...
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
defa9d863c
>We still let old code in the codebase
2017-04-24 21:22:11 -05:00
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
05d8550771
Refactors picture frames to use wall frames system
2017-04-21 17:54:34 -05:00
a7f6c44681
Fixes DVIEW runtimes in preferences. ( #490 )
2017-04-20 22:01:29 -05:00
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
ec88717fe7
Merge pull request #461 from Citadel-Station-13/upstream-merge-26287
...
[MIRROR] Removes 7 seconds from world init
2017-04-18 20:26:54 -05:00
15636e175a
Removes 7 seconds from world init
2017-04-18 18:04:29 -05:00
152c0ffdd0
Moves a temp file to the data tree
2017-04-18 03:47:11 -05:00
278cbbaf35
Refactors dbcon into a subsystem
2017-04-17 09:46:09 -05:00
13d7f88c7a
Standardizes subsystem Shutdown order
2017-04-17 09:46:05 -05:00
64068fc614
Proximity sensing refactor ( #425 )
2017-04-16 18:15:29 -04:00
2373e2e485
Afk fixup ( #412 )
2017-04-15 15:45:29 -04:00
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
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
CitadelStationBot