shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,894 Commits 5 Branches 0 Tags
02b3e47fc3de965ff3bcaf2fcb89d7f6da8bb2f4
Commit Graph

248 Commits

Author SHA1 Message Date
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Emmett Gaines
2054fc6433 lets check_dock be silent (#34614) 2018-01-21 12:34:42 -06:00
deathride58
29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569 
[MIRROR] Fixes bananium ore sprite
 2018-01-19 19:39:07 +00:00
Jordan Brown
7fd72d38fa Merge pull request #34569 from ShizCalev/this-shit-is-bananas 
Fixes bananium ore sprite
 2018-01-19 09:13:56 -06:00
Jordan Brown
95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship 
Removes teleport beacon from Free Golem Ship
 2018-01-19 08:50:20 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58
c7d3dd7e41 Merge pull request #4888 from Citadel-Station-13/upstream-merge-34322 
[MIRROR] Removes ash flora being harvested on roundstart
 2018-01-17 20:11:36 +00:00
oranges
ebdb8b1e16 Merge pull request #34322 from coiax/no-longer-harvested 
Removes ash flora being harvested on roundstart
 2018-01-16 14:36:13 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
kevinz000
81bc49cafe Fixes Jaunters 2018-01-15 12:05:46 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00: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
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
deathride58
cffbbbbbd1 mapping to mining, preparing for mob folder 2018-01-04 00:55:01 -05: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
Jordan Brown
3802cf8586 Merge pull request #33805 from Cruix/shuttle_machines 
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-30 13:56:43 -06:00
LetterJay
96358f62f2 Update aux_base.dm 2017-12-30 13:33:15 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -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
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
71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424 
[MIRROR] Standardization of return_ordered_turfs
 2017-12-11 00:06:54 +00:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
coiax
9d59e36289 Add caltrop component for spikey floor objects (#33280) 
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
 2017-12-10 10:32:03 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
vuonojenmustaturska
9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Tad Hardesty
5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
9725456c65 Update machine_unloading.dm 2017-11-09 03:23:25 -06:00
Jordan Brown
178b41547d Little change. More the same 2017-11-06 08:46:39 -06:00
Emmett Gaines
b36adfd640 No more map edge shuttle beacons (#32380) 2017-11-04 10:20:19 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00