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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
66cf0b674d
Fix ruin ripley's spawn equipment ( #2128 )
2017-07-25 15:34:36 -07:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -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
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
e2ccf1f52f
rej cleanup
2017-06-26 23:19:17 -05:00
46c3108267
Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749
...
[MIRROR] Exporting mechs!
2017-06-26 06:28:22 -05:00
e57a753701
Exporting mechs!
2017-06-25 11:35:00 -05:00
50a4f61663
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 12:09:15 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
8dae545d59
Goodbye spawn ( #1387 )
2017-06-04 09:05:47 -07:00
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
6b4b6ee70d
Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
2017-05-22 22:21:20 -05:00
64f288fda6
Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502
...
[MIRROR] Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
2017-05-22 17:21:09 -05:00
0ea672cdb9
Merge pull request #1113 from Citadel-Station-13/upstream-merge-27501
...
[MIRROR] Mechs now take the correct amount of charge from inserted cells
2017-05-22 17:20:53 -05:00
f860fce04e
Mechs now take the correct amount of charge from inserted cells
2017-05-22 11:45:59 -05:00
7a57898886
Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
2017-05-22 11:44:54 -05:00
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -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
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
8a3b280ede
Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
2017-05-06 10:42:51 -05:00
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
kevinz000