shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,183 Commits 5 Branches 0 Tags
57c829a2aab6dca828af5cdcf703dfd70f3be984
Commit Graph

255 Commits

Author SHA1 Message Date
deathride58
757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492) 
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
 2018-01-18 21:28:14 -06:00
kevinz000
6f96c169e1 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164) 
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
 2018-01-11 14:10:41 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
801eab4c3c Fixes decals being created on bad turfs (#34121) 
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
 2018-01-07 18:51:09 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Jordan Brown
505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons 
Makes crayons draw at the location you click
 2018-01-05 09:28:07 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Jordan Brown
50d75e53c9 Fixes #34030 (#34041) 2018-01-03 15:10:22 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -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
vuonojenmustaturska
9dd9d9413a Improves loot drop spawners, adds AI law spawners to cores (#33945) 
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
 2017-12-31 02:27:12 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -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
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
0381491643 oops 2017-12-27 07:08:26 -06:00
LetterJay
134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -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
oranges
4e8898d55f Merge pull request #33714 from lzimann/icon 
Job landmarks now show the mob with the proper job outfit.
 2017-12-21 19:27:23 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -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
1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJay
0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
duncathan salt
0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -06:00
LetterJay
75ccc3b354 Update anomalies.dm 2017-12-17 15:57:02 -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
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
AnturK
db3afb8ee1 This is still pretty terrible (#33495) 2017-12-13 21:09:30 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08: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
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
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
vuonojenmustaturska
9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
deathride58
9538aa645c Update bombspawner.dm 2017-11-26 21:20:00 -05:00
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
Jordan Brown
20014e6f44 Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants 
Adds spawn override system
 2017-11-25 16:37:46 -06:00
deathride58
d04bbbdd67 Update step_triggers.dm 2017-11-24 17:59:18 -05:00
deathride58
7b2a926235 Update bump_teleporter.dm 2017-11-24 17:58:29 -05:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05: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
deathride58
588b76b59e Update lootdrop.dm 2017-11-20 13:57:15 -05:00
Jordan Brown
212071e075 Adds AI lawset spawners (mapping helpers) 2017-11-20 10:12:17 -06:00