ZomgPonies
fbb53d240c
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-04 16:32:18 -04:00
Jarcolr
e3b27e3ecd
Cyborg hud modules now have proper icons
...
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
Conflicts:
code/game/objects/items/robot/robot_items.dm
2014-05-04 16:31:49 -04:00
ZomgPonies
679f0fe293
Merge pull request #194 from SamCroswell/master
...
Nukeops Weapons Rework
2014-05-04 15:43:03 -04:00
SamCroswell
2081699e54
Bullet damage tweaks
...
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
2014-05-04 11:01:39 -04:00
SamCroswell
740991092a
Nukeops Weapons Rework
...
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC
The prices are, of course, subject to change as we observe further
Nukeops rounds.
2014-05-04 10:24:48 -04:00
SamCroswell
2d44352d0f
Misc. changes
2014-05-04 09:37:28 -04:00
SamCroswell
521467fa3e
C4 now explodes on detonation, Stechtkin pistol fix
...
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
ZomgPonies
d8aa63097b
Made Vox trade shuttle dock at arrivals.
2014-05-04 00:29:14 -04:00
ZomgPonies
6851704c97
Fix some cases of metagaming, now you can only message/remote view humans
2014-05-03 23:45:55 -04:00
ZomgPonies
5c845658e5
Fixed some facehugger bugs
2014-05-03 23:32:17 -04:00
ESwordTheCat
6991391b01
I'm seeing a bug here when the object is created on initialization of the game. So hand by hand the nulling of loc.
2014-05-03 22:55:49 -04:00
ESwordTheCat
ab9fbd6713
This is what I mean.
2014-05-03 22:55:37 -04:00
ESwordTheCat
bc63fa846c
Fix compiler errors.
2014-05-03 22:55:09 -04:00
ESwordTheCat
6ecfe386bb
New way to turn on/off the debug.
2014-05-03 22:54:58 -04:00
ESwordTheCat
2541ec2a51
There's no need for Copy proc, - returns a new list anyway.
2014-05-03 22:54:47 -04:00
ESwordTheCat
503a8ac1d3
I always forgot to turn this to 0.
2014-05-03 22:54:35 -04:00
ESwordTheCat
3c3e4c7dc8
Heh forgot these.
2014-05-03 22:54:24 -04:00
ESwordTheCat
532298c725
Tweak object pool system.
...
Conflicts:
code/game/objects/structures/grille.dm
code/modules/projectiles/projectile/beams.dm
code/modules/projectiles/projectile/bullets.dm
code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
iamgoofball
01a1ce1493
Fun mode re-enabled, you can now deep fry, cerealize, and etc. anything.
2014-05-03 21:16:04 -04:00
iamgoofball
424a2522b9
CIVILLIAN OVERHAUL UNO: Chef and the Kitchen
...
Conflicts:
baystation12.dme
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
icons/obj/kitchen.dmi
2014-05-03 21:15:41 -04:00
ZomgPonies
2b85081619
Merge pull request #193 from SamCroswell/master
...
Ninja greentext fix
2014-05-03 20:56:21 -04:00
SamCroswell
39670bf97a
Ninja Greentext Fix
2014-05-03 20:52:07 -04:00
ZomgPonies
610b9b9962
Merge pull request #192 from SamCroswell/master
...
Map changes, new ninja masks, more commits possibly to come
2014-05-03 19:05:46 -04:00
SamCroswell
f4ef7c192b
Map changes, new Ninja masks
...
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
2014-05-03 18:35:10 -04:00
Zuhayr
e79097add3
Several IPC adjustments.
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-05-03 17:42:01 -04:00
Zuhayr
8986c20a4c
Removed 'You are now sterile' line from groin loss due to spam issues when lost by an IPC as well as general pointlessness.
2014-05-03 17:38:13 -04:00
Zuhayr
31e95baa78
Fixes for previous commit, sigh.
2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe
Adding some repair procs to cables and welders for IPC use.
...
Conflicts:
code/modules/power/cable.dm
2014-05-03 17:37:46 -04:00
Zuhayr
abcb0bc686
Lousy goddamn indentation.
2014-05-03 17:36:17 -04:00
Zuhayr
a7f0508a1e
Attempting to stop IPC from eating and drinking.
2014-05-03 17:36:05 -04:00
Zuhayr
7fe9b670f3
Fix for previous commit.
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
2014-05-03 17:35:55 -04:00
Zuhayr
9ec5a18e0b
IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand.
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
2014-05-03 17:34:43 -04:00
Mloc-Argent
486a919818
zas: fix zburn /0 runtime
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 17:29:55 -04:00
Cael Aislinn
18e3e37507
adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
icons/obj/hydroponics.dmi
icons/obj/xenoarchaeology.dmi
2014-05-03 17:25:57 -04:00
SamCroswell
aa3dd4b368
Merge pull request #10 from ZomgPonies/master
...
Update
2014-05-03 16:35:15 -04:00
ZomgPonies
87ec4c3309
Compile fix
2014-05-03 14:57:21 -04:00
ZomgPonies
537129b34e
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-05-03 14:56:11 -04:00
ZomgPonies
0804e21fde
Fixes people getting karma jobs
2014-05-03 14:55:57 -04:00
Regen
f63a5bed01
Fixed L.W.A.P charge cost
2014-05-03 17:02:41 +02:00
ZomgPonies
765f3c5c41
Tune chargers to new battery levels.
2014-05-02 19:10:31 -04:00
thatprogrammerguy
ac100a8568
A more strict dynamic room selection code, and fixed an incorrect area definition for the dynamic lobby south of customs.
2014-05-02 17:27:57 -04:00
thatprogrammerguy
303fb1e476
Dynamic room balancing - added initial code for a more stricter selection process.
2014-05-02 14:22:39 -04:00
thatprogrammerguy
635fe21ad2
Allowed robots to unlock xenoarcheology's suspension generator now that miner borgs can dig out artifacts and anomalies.
2014-05-02 03:27:04 -04:00
thatprogrammerguy
95dfb85675
Added dynamic areas, currently the only one sits under customs.
2014-05-02 02:52:08 -04:00
ZomgPonies
5d7257e651
This worked better before
2014-05-01 22:28:32 -04:00
ZomgPonies
fdd1d94769
Hopefully fix solars for realsies
2014-05-01 21:49:24 -04:00
ZomgPonies
1d751e7a8f
Moar rad damage from xray machine
2014-05-01 21:31:24 -04:00
ZomgPonies
40e0ff49ce
fml xray
2014-05-01 21:01:10 -04:00
ZomgPonies
bc2af1573a
Xray machine fixes
2014-05-01 18:14:56 -04:00
ZomgPonies
b46d76dccc
Made sure there's 2 slots for customs officers in code
2014-05-01 17:12:53 -04:00
