113f2770e3
somethingsomethingcaffine
2017-01-06 06:33:12 -05:00
7fb084d690
tries to address comments...
...
and will get them wrong.
2017-01-05 22:07:21 -05:00
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
339a187f9f
Fixes vision updates such as implants and similar
2016-12-21 17:59:08 -08:00
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
51a47b37b0
- 180 Reverse, Mines now banned from surplus
2016-12-20 10:09:38 +00:00
c5e6c9323b
addresses mrrowl comments
...
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
e06218371f
Sharper character creation preview images, tails/body accessories now show up in ID photos.
2016-11-25 17:55:57 -05:00
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
fae398ae42
Replaces \blue and \red with spans, removes unnecessary SRCs and :s, Fixes Negative Cable Coil Bug
2016-11-13 18:16:37 -05:00
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
f67bccb444
Merge pull request #5764 from Markolie/teg2
...
TEG refactor
2016-10-30 19:56:26 -04:00
eb21043b9a
Merge pull request #5815 from Fox-McCloud/food-refactor
...
Food refactor
2016-10-28 22:37:19 -04:00
7ca1330749
further tweaks
2016-10-25 16:46:41 -04:00
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
45ba4d157a
Merge pull request #5416 from KasparoVy/tail_markings_mark2
...
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
1a307cd8c9
Identity theft objective set fix, tank examine fix, proccall null return fix
2016-10-21 17:51:38 +02:00
01f4e64f12
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-10-12 20:37:09 -04:00
78eb685ac6
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-12 20:25:48 -04:00
c4f7730764
Additional TEG changes
2016-10-12 14:00:02 +02:00
dfde050407
Merge pull request #5644 from GeneralChaos81/Conveyors
...
Port of TGs conveyors
2016-10-11 20:27:46 -04:00
a577cd206c
TEG refactor
2016-10-11 22:49:51 +02:00
0b227c3d5b
Merge pull request #5646 from Fox-McCloud/grenade-tweak
...
Atmos Grenade Balance
2016-10-10 20:54:23 -04:00
a64f1849c0
Actually fixes the implants this time
2016-10-10 12:51:56 +02:00
230ec7603d
Merge pull request #5750 from FlattestGuitar/nukiefix
...
Fixes nukie cyberimplants being free
2016-10-09 12:31:14 -04:00
e2ce799aa1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-08 22:21:48 -04:00
864a9ba612
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-10-07 23:51:48 -04:00
7592c65fe0
❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️ ❄️
2016-10-07 20:13:24 +02:00
3201ea3ccb
Merge pull request #5738 from FlattestGuitar/fix
...
adds logs to missionary stuffs
2016-10-04 08:36:16 -04:00
03cc776d40
moves the stuffs to mind.dm
2016-10-04 13:58:30 +02:00
26fe47faa7
Merge pull request #5638 from theColdflame/10mmuplink
...
Adds 10mm variants to the syndicate uplink.
2016-10-02 10:48:32 -04:00
3e653a6279
Conflict resolution.
2016-09-26 12:17:35 -04:00
bd73e58d60
description
2016-09-26 04:43:10 +01:00
dee83ef62e
ALL HAIL LEMONS
2016-09-22 02:00:04 -04:00
2b19b81b99
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-09-17 01:38:02 -04:00
fd9d6d8c71
ui stuff then map conflicts
2016-09-16 00:45:37 -04:00
aaa08f2189
adds unique references
2016-09-12 21:38:09 +01:00
12d23a061f
tweak 2
2016-09-12 14:32:10 -04:00
f1aada7ea1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-11 19:50:53 -04:00
9a0b8b7c39
Atmos Grenade Balance
2016-09-09 13:53:53 -04:00
4af47209ae
Removed all the commented sections after testing.
2016-09-09 17:53:11 +10:00
010293bbf8
Port of TGs buildable conveyors. We can finally repair broken conveyors!
2016-09-09 16:35:08 +10:00
b0ac462166
Integrates UIDs into View Variables
2016-09-08 19:04:50 -04:00
9292c4b304
adds 10mm variants to uplink
...
fixes typo
fixes extra line
fixes HP uplink name
don't code at 1am
2016-09-08 10:55:07 +01:00
Aurorablade