DeityLink
393d5b29f8
motherfucker.dme
2014-11-27 06:56:19 +01:00
DeityLink
cbfd4ec08a
solving conflict
2014-11-27 06:47:56 +01:00
DeityLink
175d04e8f5
Adminbus fixing part 5
2014-11-25 03:58:56 +01:00
DeityLink
db901f9336
fixing more conflicts
2014-11-23 17:37:50 +01:00
DeityLink
76b66de477
Adminbus fixing part 2
2014-11-23 17:31:50 +01:00
DeityLink
b70d458c52
Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final
2014-11-21 07:19:53 +01:00
DeityLink
7890a3f08b
Adminbus part 6
2014-11-21 01:42:55 +01:00
DeityLink
5afca6f51f
Adminbus part5
2014-11-18 14:43:28 +01:00
ComicIronic
ca0d7ed5cc
Added the PDA Painter, redone and improved.
2014-11-17 20:21:49 +00:00
DeityLink
7743001bd1
Adminbus part4
2014-11-17 08:53:31 +01:00
DeityLink
5e922647bf
Adminbus part3
2014-11-15 21:21:05 +01:00
DeityLink
09bf70457a
Adminbus part1
2014-11-13 05:27:43 +01:00
DeityLink
65ce522674
Vending Machine recharge packs
2014-11-09 22:40:37 +01:00
ComicIronic
12afbfabfd
Fix merge conflicts, add map changes, minor other fixes.
2014-11-05 17:43:13 +00:00
d3athrow
e6c40bcd05
Merge pull request #1738 from ComicIronic/Spacepods
...
Spacepods Overhaul #2 - Son of Spacepods
2014-11-04 14:51:04 -06:00
d3athrow
1881033d2c
Merge pull request #1833 from ComicIronic/PlasmaSuits
...
Added in job space suits for plasmamen.
2014-11-03 09:58:18 -06:00
ComicIronic
4a39d764a2
Added in job space suits for plasmamen.
2014-11-02 23:20:02 +00:00
Rob Nelson
dd9691bb54
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/setup.dm
2014-11-02 12:47:21 -08:00
ComicIronic
11adf8bce7
Fix merge conflicts.
2014-11-02 14:29:55 +00:00
d3athrow
2ddbaf2004
Merge pull request #1777 from dylanstrategie/Surgery
...
Re-introduce sex change surgery
2014-11-02 08:20:36 -06:00
ComicIronic
214b463b2c
Moved the files into a module.
2014-11-02 11:20:10 +00:00
Rob Nelson
89ba2d7062
Objects now melt() into slag if their melt_temperature is set.
2014-11-02 01:48:49 -07:00
ComicIronic
534e1c0ebe
Fix merge conflicts.
2014-11-01 21:58:28 +00:00
ComicIronic
c36f080072
Fix merge conflicts.
2014-11-01 18:42:17 +00:00
d3athrow
f9f8781c7d
Merge pull request #1764 from eswordthecat/patch-1
...
Use s_html library by Spuzzum
2014-10-31 23:53:29 -05:00
ComicIronic
ec7561bd8d
Mechanic major files.
...
Missing sprites.
2014-10-31 23:41:24 +00:00
Chris
8a3e9b2428
Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/modules/projectiles/guns/energy/special.dm
maps/tgstation.dmm
2014-10-31 12:02:10 -05:00
ComicIronic
e0f465455d
Merge remote-tracking branch 'upstream/Bleeding-Edge' into Spacepods.
...
Update merge conflicts.
2014-10-30 21:03:14 +00:00
d3athrow
1ed929ef3f
Merge pull request #1773 from ComicIronic/FabricatorChanges
...
Fabricator overhaul - RnD machines
2014-10-30 14:42:11 -05:00
d3athrow
cdd0177276
Merge pull request #1802 from ComicIronic/NuTaxi
...
TAXISTATION: Update to taxi movement
2014-10-30 14:40:51 -05:00
ComicIronic
09f58736b8
Big update to taxi computers and calling.
...
Fixed taxi movement and hyperspace issues I was having.
Made taxi computers more modular, because there was a lot of repeated code.
All stations now have taxi caller buttons with taxi access.
Taxi computers now only list the living stations unless they get emagged, then they also list the derelict.
Taxi buttons at derelict don't work. Honk.
2014-10-30 17:49:20 +00:00
d3athrow
41d87d165c
Merge pull request #1750 from ComicIronic/MatSynth
...
Added the material synthesizer, and commented out materials for MoMMIs.
2014-10-30 10:51:47 -05:00
DeityLink
77de6f74ed
rabid slimes
2014-10-28 19:14:32 +01:00
ComicIronic
5ebe31f10b
Merge remote-tracking branch 'upstream/Bleeding-Edge' into FabricatorChanges
2014-10-28 15:51:23 +00:00
dylanstrategie
9b493c3bf9
Add the right file this time
2014-10-27 18:59:08 +01:00
eswordthecat
92856e45f6
Use s_html library by Spuzzum (hex2num, invertHTML and num2hex replaced by this).
2014-10-27 00:09:51 -08:00
Chris
d31dcaba9f
Merge branch 'Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/modules/power/singularity/singularity.dm
2014-10-26 10:56:36 -05:00
d3athrow
bd87dbee57
Merge pull request #1711 from DeityLink/some-more-cult-stuff
...
the NARSIE HAS RISEN update
2014-10-26 10:51:34 -05:00
ComicIronic
6db761572b
Updated the DME, added access to the podfab and podfab to map, changed usr and span.
2014-10-25 17:49:20 +01:00
ComicIronic
5c3c8605b0
Merge remote-tracking branch 'origin/Bleeding-Edge' into MaterialsRedo
2014-10-25 14:00:54 +01:00
ComicIronic
3fc95066f3
Big ol update of materials and fabricators for research.
2014-10-25 13:36:49 +01:00
Chris
0445314e23
Merge branch 'Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/game/machinery/machinery.dm
code/setup.dm
maps/tgstation.dmm
2014-10-24 23:42:32 -05:00
DeityLink
fdde481195
cultify() everything! (only obj and turf actually)
...
I don't think adding cultify to mobs is necessary since it's more a
matter of "are they cultists or not" and "are they constructs or not"?
The only exceptions are the hostile creatures that roam in hell.
2014-10-24 17:02:40 +02:00
ComicIronic
a2048c7904
Added the material synthesizer, and commented out materials for MoMMIs.
2014-10-23 23:09:13 +01:00
DeityLink
07bcc303e7
Merge remote-tracking branch 'origin/Bleeding-Edge' into some-more-cult-stuff
2014-10-22 14:56:51 +02:00
DeityLink
f3f02d4c9f
fixed corgi missing verb
...
I had forgotten to include corgi_powers.dm in the .dme
2014-10-22 14:27:07 +02:00
ComicIronic
0c8f475145
Merge remote-tracking branch 'upstream/Bleeding-Edge' into Spacepods
2014-10-21 20:03:32 +01:00
ComicIronic
b00ee9ec1a
DME changes, as well as code changes and added design
2014-10-21 19:01:46 +01:00
Chris
71e8adf74e
Merge branch 'Bleeding-Edge' into bay_hydro_port
2014-10-21 09:43:22 -05:00
d3athrow
514c3ff963
Merge pull request #1726 from DeityLink/monkey-suits
...
Monkey Clothes
2014-10-21 09:39:20 -05:00
