shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph

63 Commits

Author SHA1 Message Date
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -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
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
oranges
384332fe20 Small refactor to movement (#31071) 
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.

Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination

Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
 2017-09-30 07:23:35 -05:00
vuonojenmustaturska
1aef27a0f0 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967) 
* Jump boots fix

* requested changes

* Requested changes, also whoops
 2017-09-26 04:29:18 -05:00
CitadelStationBot
ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
AnturK
317958fb5c Fixes more CanPass misuse (#30493) 
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
 2017-09-09 19:41:02 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
LetterJay
e310435892 UI objects should PIXEL_SCALE 2017-09-02 05:26:22 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
CitadelStationBot
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
CitadelStationBot
e1c8973f82 Fixes things getting unbuckled in nullspace (#1606) 2017-06-20 08:04:01 -07:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
97286d25fc [MIRROR] Allows varediting loc and coords of atom/movables (#1020) 
* Allows varediting loc and coords of atom/movables

* Update atoms_movable.dm

* Delete atoms_movable.dm.rej
 2017-05-18 14:28:24 -05:00
CitadelStationBot
3e26a2d60f Adds a proc for copying languages from another thing (#1021) 2017-05-18 13:18:04 -05:00
CitadelStationBot
f345d6a3ca [MIRROR] You can no longer bypass language restrictions with default language (#859) 
* You can no longer bypass language restrictions with default language

* resolve rej files

* Update language_menu.dm
 2017-05-18 05:05:19 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot
3cd889b8ce Language icons 2017-04-28 09:59:07 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
LetterJay
417b80bb42 Merge pull request #516 from Verkister/master 
Bringing back the dogborgos.
 2017-04-26 06:24:26 -05:00
CitadelStationBot
4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
Verkister
d66e609d48 Bringing back the dogborgos. 
-Also replaced the offset breaking forth-reset attack anim with forth-back as I did last time.
-Dogborg pounce is currently broken and slapping people with hud icons may be harmful for immursions.
-No Borgi yet because I can't be arsed to readd the whole sprite set this tired.
 2017-04-23 02:36:31 +03:00
LetterJay
0db0c55ade Merge pull request #507 from Citadel-Station-13/upstream-merge-26408 
[MIRROR] Conveyor movement refactor/fix
 2017-04-22 14:36:22 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBot
be30a8cd20 fixes a proc cache to be more obvious it's a proc cache 2017-04-21 17:18:37 -05:00
CitadelStationBot
64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00
CitadelStationBot
f510bf2a03 [MIRROR] Fixes master (#409) 
* Fixes master

* adds missing #endif

* Revert "adds missing #endif"

This reverts commit 6e6124ed64ec7593e27a31393b54971c5050a5aa.

* master fix

* removes .rej
 2017-04-15 15:44:00 -04:00
CitadelStationBot
b239a9620a PIXEL_SCALE Test [WIP] (#408) 2017-04-15 15:02:01 -04:00