5e29e77f37
Ctrl-clicking mobs is consistent in that it upgrades grabs ( #35547 )
...
cl Jittai
tweak: Ctrl+Clicking progresses through grab cycle on living mobs (not just humans)
/cl
2018-02-19 22:09:09 -06:00
3aa246d39b
[Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
2018-01-24 13:47:40 -06:00
4451aca2e8
Refactor weather to use Z traits, assorted related cleanup ( #34633 )
...
* Add a proc for getting the station center
* Add a couple of comments to ZTRAIT defines
* Remove unused global_map list
* Refactor weather to use the trait system
* Un-hardcode the transit z-level
* Use Z traits to determine Portal Storm event areas
* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
7f34b90e7c
Merge pull request #34573 from AnturK/slidethis
...
Fixes the diagonal sliding
2018-01-19 08:50:28 -06:00
1d91243ae2
[READY]Pulling claw 2 ( #33817 )
...
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
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
5486f71010
woo
2018-01-01 07:30:50 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
30e8b2a12d
Merge pull request #33683 from AnturK/getcommandfix
...
Fixes get admin command
2017-12-19 14:30:27 -06:00
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
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
c5013d65f6
Adds "Get" command to movable vv dropdown ( #33296 )
2017-12-11 20:35:16 -06:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
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
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
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
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
ecce4cf138
[MIRROR] New DCS signals ( #2741 )
...
* New DCS signals
* Update atoms.dm
* actually ports comsigs
2017-09-19 07:00:08 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
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
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
e310435892
UI objects should PIXEL_SCALE
2017-09-02 05:26:22 -05:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
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
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
e1c8973f82
Fixes things getting unbuckled in nullspace ( #1606 )
2017-06-20 08:04:01 -07:00
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
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
3e26a2d60f
Adds a proc for copying languages from another thing ( #1021 )
2017-05-18 13:18:04 -05:00
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
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
46f5c4bb1b
commit
2017-05-16 23:35:54 -05:00
Jittai