cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,595 Commits 8 Branches 0 Tags
7bb9ca6ec2485ad15e3a2e24e38a0377b58a3bea
Commit Graph

1819 Commits

Author SHA1 Message Date
Zuhayr
7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
Ccomp5950
889019b445 Merge pull request #10163 from PsiOmegaDelta/150713-Fixes 
Fixes
 2015-07-13 09:35:58 -04:00
PsiOmega
750c3f9e66 Puts the world end handling inside a spawn instead of sleep. 2015-07-13 10:13:45 +02:00
GinjaNinja32
b04ed47e2f Merge pull request #10070 from Mloc/lightwrite-2 
Lighting overlay changes + optimizations
 2015-07-12 15:51:44 +01:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight 
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-09 19:17:04 +01:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag 
Based on https://github.com/d3athrow/vgstation13/pull/5273.
 2015-07-07 12:55:39 +02:00
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
94ffb49bfb Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end 2015-06-26 01:04:03 +01:00
PsiOmegaDelta
fdab654beb Grid check now respects critical APC status. 
Fixes #9919.
On power failure critical APCs are left alone, however on power restoration critical APCs are still included.
 2015-06-25 14:12:05 +02:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
GinjaNinja32
9613fae16a Wizard suits will now be refitted automatically for non-human wizards 2015-06-13 13:43:51 +01:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Atlantis
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02:00
PsiOmega
bcb1ea5413 Endgame tweaks. 
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
 2015-05-26 12:29:50 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/toys.dm
 2015-05-26 08:26:48 +02:00
PsiOmega
4956af8597 Fixes #9461. 
Corrects the path of the uplink item.
 2015-05-25 17:59:41 +02:00
Atlantis
c2c3a2c689 Implements remaining suggestions 
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
 2015-05-24 03:05:27 +02:00
Atlantis
da22851ff7 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-24 01:16:09 +02:00
Atlantis
ef040583c8 Implements github suggestions 
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
 2015-05-23 22:22:38 +02:00
Atlantiscze
5aa37bd859 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-23 21:22:23 +02:00
Atlantiscze
06ec54c7b8 Modified behavior of machine overload to further prevent spam and to make it more useful if targeted on high-power machinery such as SMES. 
- This is a WIP thing. Commiting so i can finish it on my second computer.
 2015-05-23 21:19:32 +02:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Atlantis
d8141445e4 Implements suggestions 
- Hardware examine is now generated by hardware's proc.
- Camera network updating now uses proper procs
- Bugfix: APU Generator no longer prevents you from using NanoUI based devices
- Bugfix: Fixes rare runtime on roundstart.
 2015-05-21 13:27:18 +02:00
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation 
Attack animations
 2015-05-21 06:52:30 +02:00
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Atlantis
f0cd799021 Changelog + fluff fix 
- Finally adds changelog entry
- System override message modified according to github discussion.
 2015-05-19 17:28:21 +02:00
Atlantis
4cd2417eb8 Implements suggestions from github 
- qdel() instead of del()
- z in config.station_levels insted of z == 1
- Typo fix
- Playercount is now 2 instead of 1 which was debug setting
- AI is now properly deleted when struck by very strong explosion (heavy impact).
- Hardware now properly uses install(). Hardware list is generated from existing datums using typesof()
 2015-05-18 22:05:18 +02:00
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2015-05-18 17:50:48 +02:00
Chinsky
a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart 
Gamestart cleanup.
 2015-05-18 12:00:49 +03:00
Zuhayr
8917a03380 Merge pull request #9296 from PsiOmegaDelta/TurfProcessing 
Turf processing
 2015-05-17 22:51:45 +09:30
Github is ok, I guess
77206c6f5f Update gameticker.dm 2015-05-17 10:36:59 +01:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Atlantiscze
71bfe729fa Compile Fix 
- Fixes mistake in previous commit.
 2015-05-17 02:59:59 +02:00
Atlantiscze
bcfbfdedba CPU Generation adjustment 
- Doubles CPU generation from APCs. Testing revealed that current values are simply too small.
- Decreases DualCPU hardware boost to +50% CPU generated (instead of +100%)
- Minor code clean-up at hardware selection screen.
 2015-05-17 02:54:58 +02:00
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30
PsiOmega
729a7a3ec9 Gamestart cleanup. 
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
 2015-05-16 10:59:45 +02:00
PsiOmega
163aab3753 Adds turf processing. 
Currently only used by walls. Radioactive walls now irradiate nearby mobs.
 2015-05-16 10:27:47 +02:00
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
Zuhayr
1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
GinjaNinja32
21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00
GinjaNinja32
a353c90159 Super-small fix. 2015-05-13 20:41:40 +01:00