shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,509 Commits 5 Branches 0 Tags
70525101654cefada87ff6bbcaee4d6abebf06fb
Commit Graph

276 Commits

Author SHA1 Message Date
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919 
[MIRROR] turfs changed to /space/basic are instead turned into /space
 2018-01-02 18:13:42 -06:00
LetterJay
dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
oranges
18f5e1095a Merge pull request #34035 from ninjanomnom/actually-changeturf 
Puts back the changeturf part of PlaceOnTop()
 2018-01-02 00:12:32 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
515092bd1c Merge branch 'master' into upstream-merge-33919 2018-01-01 04:11:29 -06:00
Jordan Brown
4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup 
cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 10:01:46 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
Jordan Brown
cbb8d807f1 turfs changed to /space/basic are instead turned into /space 2017-12-30 13:14:04 -06:00
LetterJay
f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558 
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
 2017-12-29 06:24:09 -06:00
Robustin
a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558) 
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
 2017-12-29 00:29:19 -06:00
AnturK
fbdf24ddd4 Fixes wall CanPass (#33880) 2017-12-29 00:28:32 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634 
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
 2017-12-26 05:29:42 -06:00
LetterJay
91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay
d6c1c7ecc9 Merge branch 'master' into upstream-merge-33634 2017-12-24 02:39:35 -06:00
oranges
a89435ac33 Merge pull request #32433 from kevinz000/vector_projectiles 
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-21 19:33:42 -06:00
Ashe Higgs
c5485faee7 Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584) 
* Blessing tiles blocks servant warp

* Removes the color

* Prevents the message from showing on the same turf
 2017-12-21 06:37:06 -06:00
Tad Hardesty
30fb3f8f5c Fix pulling things across space transitions (#33689) 2017-12-21 00:33:52 -06:00
Ashe Higgs
a3323c1b95 (probably?) Fixes being able to create two Eminences at a time + other Eminence issues 2017-12-21 00:01:50 -06:00
oranges
d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan Brown
057d05df91 Merge pull request #33484 from vuonojenmustaturska/eminencefix 
Fixes glass shard/bananium floor behavior for cameras and ghosts
 2017-12-13 09:14:16 -06:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
AnturK
e1fece081f Limit bullet overlays on walls (#33364) 
* Limit bullet overlays on walls

* Whitespace bad

* Okay

* Touching this because I'm testing TGS3 stuff

* Update walls.dm
 2017-12-08 10:33:39 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
Jordan Brown
e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
ShizCalev
12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
Tad Hardesty
38c45fb479 Refactor chasm paths to be more sane (#32701) 
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
 2017-11-22 03:30:49 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 
# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm
 2017-11-20 23:34:46 -05:00
WJohn
e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie
7ca6c282f3 Merge pull request #32883 from vuonojenmustaturska/tendrilqdel 
Fixes tendril-related things failing to qdel because of chasm shenanigans
 2017-11-19 22:29:41 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00