cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,898 Commits 10 Branches 0 Tags
d66f4457a1a1f4e0c8db1e62cfa024054953e23f
Commit Graph

17204 Commits

Author SHA1 Message Date
Zuhayr
d66f4457a1 Merge pull request #8211 from PsiOmegaDelta/Starlight 
Ports /tg/'s starlight luminance.
 2015-02-24 02:19:50 +10:30
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary 
Map updates and fixes, plus hardsuit icons
 2015-02-23 15:27:35 +03:00
PsiOmegaDelta
bbbde676d5 Merge pull request #8200 from mwerezak/devfixes 
Misc dev updates
 2015-02-23 10:15:42 +01:00
PsiOmega
5023fa4000 Ports /tg/'s starlight luminance. 
Because configuration is initialized before the map we also don't have the same runtimes issues corrected by https://github.com/tgstation/-tg-station/pull/7806.
 2015-02-23 10:11:46 +01:00
mwerezak
4a762d7459 Adjusts bullet penetration to account for reduced damage 2015-02-22 23:28:06 -05:00
mwerezak
dfec1fcb5c Improves energy gun charge icon handling, adds ion rifle in-hand sprite. 2015-02-22 21:46:18 -05:00
mwerezak
3ae3ef7961 Merge remote-tracking branch 'upstream/dev' into runtime 2015-02-22 21:13:20 -05:00
mwerezak
6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary 
Conflicts:
	code/game/objects/items/devices/uplinks.dm
 2015-02-22 20:44:43 -05:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable 
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
 2015-02-22 20:27:06 -05:00
mwerezak
c317fb8c39 Adds ability for uplink purchases to produce more than one item 2015-02-22 20:17:18 -05:00
PsiOmegaDelta
58ff042fc8 Merge pull request #8197 from mwerezak/mecha-airlocks 
Allows exosuits to interface with adjacent airlock controllers and buttons
 2015-02-22 16:50:06 +01:00
Chinsky
79917d57b2 Merge pull request #8187 from PsiOmegaDelta/SyndicateDescriptions 
Rudimentary uplink descriptions.
 2015-02-22 11:32:49 +03:00
Chinsky
2d03c412f7 Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor 
Examine Tab 2: Revenge of the Refactor: Reloaded
 2015-02-22 11:32:32 +03:00
Zuhayr
3900b90abc Merge pull request #8203 from Baystation12/master 
Master into dev.
 2015-02-22 18:24:47 +10:30
mwerezak
2fcf8d51f4 Allows exosuits to interface with adjacent airlock controllers and buttons. 2015-02-21 20:54:01 -05:00
mwerezak
f7c65b4358 Makes IB no longer contribute to overall damage 2015-02-21 16:56:25 -05:00
mwerezak
47cbfdd59e Keeps zone selection and gun mode toggle HUD elements visible when scoped 2015-02-21 16:01:47 -05:00
mwerezak
11719a380e Fixes #8151 2015-02-21 15:49:52 -05:00
mwerezak
5d627d4b24 Fixes compile warning, cleanup 2015-02-21 15:36:33 -05:00
mwerezak
5bc076cc25 Adds a better placeholder item_state for the ion rifle 2015-02-21 14:25:06 -05:00
mwerezak
5be4a2f0e4 Merge remote-tracking branch 'upstream/dev' into mercenary 2015-02-21 13:22:51 -05:00
Zuhayr
e0267c4adf Merge pull request #8194 from comma/gore 
Surgery overlays
 2015-02-22 01:00:47 +10:30
Zuhayr
cbcb838a0c Merge pull request #8188 from emmanuelbassil/gargle 
Fixes #8174
 2015-02-22 01:00:18 +10:30
Chinsky
acfd99e33c Surgery now shows up on mob, in all gory glory. 2015-02-21 16:31:44 +03:00
emmanuelbassil
a46540ecd7 Damn you space 2015-02-21 14:53:33 +02:00
GinjaNinja32
ca6448fa4c Fixes #8192 2015-02-21 12:11:40 +00:00
Chinsky
4daf7161ad Merge pull request #8191 from PsiOmegaDelta/NanoFix 
Fixes runtime in Topics() when called from non-NanoUI sources.
 2015-02-21 14:34:09 +03:00
emmanuelbassil
feb335c172 Goddamnit. 2015-02-21 11:56:01 +02:00
emmanuelbassil
0621e6adea Adding ..() 2015-02-21 11:39:36 +02:00
PsiOmega
89da19de8a Fixes runtime in Topics() when called from non-NanoUI sources. 2015-02-21 10:32:20 +01:00
Zuhayr
0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
PsiOmega
4c8bf16628 Rudimentary uplink descriptions. 2015-02-21 10:16:47 +01:00
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths 
Adds robot synths
 2015-02-21 11:43:39 +03:00
Chinsky
214324eaaf Merge pull request #8156 from PsiOmegaDelta/CameraMove 
Custom ninja spawn points.
 2015-02-21 11:43:19 +03:00
emmanuelbassil
ec8b3fe195 Forgot the else! 2015-02-21 10:14:33 +02:00
emmanuelbassil
88dd80088c Using switch statement 2015-02-21 08:43:43 +02:00
Chinsky
2b2332cfc1 Merge pull request #8157 from mwerezak/gun-rewrite 
Better handling of mob projectile passthrough and embedding + some gun tweaks
 2015-02-21 07:52:58 +03:00
Chinsky
6bd495fc47 Merge pull request #8164 from PsiOmegaDelta/NanoAir 
Air Alarm and Atmospheric Controller NanoUI
 2015-02-21 07:51:01 +03:00
Chinsky
8a0f2213bd Merge pull request #8158 from MrSnapwalk/moretoys 
Adds more toys.
 2015-02-21 07:50:25 +03:00
Chinsky
2361cf91f0 Merge pull request #8186 from PsiOmegaDelta/IcarusLogs 
Icarus cannon admin logs.
 2015-02-21 07:50:14 +03:00
Chinsky
dcff550628 Merge pull request #8178 from mwerezak/windowzas 
Firedoors and blast doors no longer block zones
 2015-02-21 07:50:08 +03:00
MrSnapwalk
ee24bdb3b1 Adds the spider plushie - sprite by Bishop. 2015-02-20 21:17:46 -06:00
MrSnapwalk
cf431370f3 Action figure un-refactor, minor fix. 2015-02-20 21:02:26 -06:00
mwerezak
09afd35798 Syringe gun cartridges change name when loaded 2015-02-20 21:04:19 -05:00
mwerezak
598ab2a207 Adds a mostly module-less merc rig type 2015-02-20 19:21:32 -05:00
emmanuelbassil
db702e13b6 Fixes #8174 2015-02-20 23:33:22 +02:00
PsiOmega
f0a5dae1c4 Icarus cannon admin logs. 2015-02-20 19:54:15 +01:00
Kelenius
83fc1689ef Fixes a turret runtime 2015-02-20 20:19:12 +03:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Zuhayr
31edc34a3d Merge pull request #8184 from Kelenius/ofDronesAndVerbs 
Axes drone verb category
 2015-02-21 02:32:30 +10:30